Moving around files into package structure similar to what is in the …

…github xdm repo - github.com/adobe/xdm

.gitignore

@@ -1,4 +1,4 @@
 target
 *.iml
-
+.idea/
 temp

src/main/java/com/adobe/xdm/event/Xdm.java → src/main/java/com/adobe/xdm/Xdm.java

@@ -14,8 +14,9 @@
  * is strictly forbidden unless prior written permission is obtained
  * from Adobe Systems Incorporated.
  */
-package com.adobe.xdm.event;
+package com.adobe.xdm;
 
+import com.adobe.xdm.common.XdmContext;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Xdm {

src/main/java/com/adobe/xdm/event/Asset.java → src/main/java/com/adobe/xdm/assets/Asset.java

@@ -14,8 +14,10 @@
  * is strictly forbidden unless prior written permission is obtained
  * from Adobe Systems Incorporated.
  */
-package com.adobe.xdm.event;
+package com.adobe.xdm.assets;
 
+import com.adobe.xdm.common.XdmContext;
+import com.adobe.xdm.external.ActivityStreamObject;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;

src/main/java/com/adobe/xdm/event/XdmContext.java → src/main/java/com/adobe/xdm/common/XdmContext.java

@@ -14,7 +14,7 @@
  * is strictly forbidden unless prior written permission is obtained
  * from Adobe Systems Incorporated.
  */
-package com.adobe.xdm.event;
+package com.adobe.xdm.common;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;

src/main/java/com/adobe/xdm/event/XdmEvent.java → src/main/java/com/adobe/xdm/common/XdmEvent.java

@@ -14,8 +14,9 @@
  * is strictly forbidden unless prior written permission is obtained
  * from Adobe Systems Incorporated.
  */
-package com.adobe.xdm.event;
+package com.adobe.xdm.common;
 
+import com.adobe.xdm.external.ActivityStreamObject;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;

src/main/java/com/adobe/xdm/event/ContentRepository.java → src/main/java/com/adobe/xdm/content/ContentRepository.java

@@ -14,8 +14,10 @@
  * is strictly forbidden unless prior written permission is obtained
  * from Adobe Systems Incorporated.
  */
-package com.adobe.xdm.event;
+package com.adobe.xdm.content;
 
+import com.adobe.xdm.common.XdmContext;
+import com.adobe.xdm.external.ActivityStreamObject;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;

src/main/java/com/adobe/xdm/event/Page.java → src/main/java/com/adobe/xdm/content/Page.java

@@ -14,8 +14,10 @@
  * is strictly forbidden unless prior written permission is obtained
  * from Adobe Systems Incorporated.
  */
-package com.adobe.xdm.event;
+package com.adobe.xdm.content;
 
+import com.adobe.xdm.common.XdmContext;
+import com.adobe.xdm.external.ActivityStreamObject;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;

src/main/java/com/adobe/xdm/event/AemAssetCreatedEvent.java

@@ -16,6 +16,7 @@
  */
 package com.adobe.xdm.event;
 
+import com.adobe.xdm.common.XdmContext;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;

src/main/java/com/adobe/xdm/event/AemAssetDeletedEvent.java

@@ -16,6 +16,7 @@
  */
 package com.adobe.xdm.event;
 
+import com.adobe.xdm.common.XdmContext;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;

src/main/java/com/adobe/xdm/event/AemAssetEvent.java

@@ -16,6 +16,11 @@
  */
 package com.adobe.xdm.event;
 
+import com.adobe.xdm.assets.Asset;
+import com.adobe.xdm.common.XdmEvent;
+import com.adobe.xdm.content.ContentRepository;
+import com.adobe.xdm.extensions.aem.AemUser;
+import com.adobe.xdm.extensions.ims.ImsOrg;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;

src/main/java/com/adobe/xdm/event/AemAssetUpdatedEvent.java

@@ -16,6 +16,7 @@
  */
 package com.adobe.xdm.event;
 
+import com.adobe.xdm.common.XdmContext;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;

src/main/java/com/adobe/xdm/event/AemPageEvent.java

@@ -16,14 +16,19 @@
  */
 package com.adobe.xdm.event;
 
+import com.adobe.xdm.common.XdmEvent;
+import com.adobe.xdm.content.ContentRepository;
+import com.adobe.xdm.content.Page;
+import com.adobe.xdm.extensions.aem.AemUser;
+import com.adobe.xdm.extensions.ims.ImsOrg;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import java.io.Serializable;
 
 @JsonInclude(Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class AemPageEvent extends XdmEvent<Page, ImsOrg, ContentRepository, AemUser>  implements
+public class AemPageEvent extends XdmEvent<Page, ImsOrg, ContentRepository, AemUser> implements
     Serializable {
 
   public AemPageEvent() {

src/main/java/com/adobe/xdm/event/AemPagePublishedEvent.java

@@ -16,6 +16,7 @@
  */
 package com.adobe.xdm.event;
 
+import com.adobe.xdm.common.XdmContext;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;

src/main/java/com/adobe/xdm/event/AemPageUnpublishedEvent.java

@@ -16,6 +16,7 @@
  */
 package com.adobe.xdm.event;
 
+import com.adobe.xdm.common.XdmContext;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;

src/main/java/com/adobe/xdm/event/CCAssetCreatedEvent.java

@@ -16,6 +16,7 @@
  */
 package com.adobe.xdm.event;
 
+import com.adobe.xdm.common.XdmContext;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;

src/main/java/com/adobe/xdm/event/CCAssetDeletedEvent.java

@@ -16,6 +16,7 @@
  */
 package com.adobe.xdm.event;
 
+import com.adobe.xdm.common.XdmContext;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;

src/main/java/com/adobe/xdm/event/CCAssetEvent.java

@@ -16,6 +16,10 @@
  */
 package com.adobe.xdm.event;
 
+import com.adobe.xdm.assets.Asset;
+import com.adobe.xdm.common.XdmEvent;
+import com.adobe.xdm.content.ContentRepository;
+import com.adobe.xdm.extensions.ims.ImsUser;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;

src/main/java/com/adobe/xdm/event/CCAssetUpdatedEvent.java

@@ -16,6 +16,7 @@
  */
 package com.adobe.xdm.event;
 
+import com.adobe.xdm.common.XdmContext;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;

src/main/java/com/adobe/xdm/event/OsgiEmittedEvent.java

@@ -16,14 +16,21 @@
  */
 package com.adobe.xdm.event;
 
+import com.adobe.xdm.common.XdmEvent;
+import com.adobe.xdm.content.ContentRepository;
+import com.adobe.xdm.common.XdmContext;
+import com.adobe.xdm.extensions.aem.AemUser;
+import com.adobe.xdm.extensions.aem.OsgiEvent;
+import com.adobe.xdm.extensions.ims.ImsOrg;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import java.io.Serializable;
 
 @JsonInclude(Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class OsgiEmittedEvent extends XdmEvent<OsgiEvent, ImsOrg, ContentRepository, AemUser> implements
+public class OsgiEmittedEvent extends
+    XdmEvent<OsgiEvent, ImsOrg, ContentRepository, AemUser> implements
     Serializable {
 
   public OsgiEmittedEvent() {

src/main/java/com/adobe/xdm/event/AemUser.java → src/main/java/com/adobe/xdm/extensions/aem/AemUser.java

@@ -14,8 +14,10 @@
  * is strictly forbidden unless prior written permission is obtained
  * from Adobe Systems Incorporated.
  */
-package com.adobe.xdm.event;
+package com.adobe.xdm.extensions.aem;
 
+import com.adobe.xdm.common.XdmContext;
+import com.adobe.xdm.external.ActivityStreamObject;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;

src/main/java/com/adobe/xdm/event/OsgiEvent.java → src/main/java/com/adobe/xdm/extensions/aem/OsgiEvent.java

@@ -14,8 +14,10 @@
  * is strictly forbidden unless prior written permission is obtained
  * from Adobe Systems Incorporated.
  */
-package com.adobe.xdm.event;
+package com.adobe.xdm.extensions.aem;
 
+import com.adobe.xdm.common.XdmContext;
+import com.adobe.xdm.external.ActivityStreamObject;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;

src/main/java/com/adobe/xdm/event/ImsOrg.java → src/main/java/com/adobe/xdm/extensions/ims/ImsOrg.java

@@ -14,8 +14,10 @@
  * is strictly forbidden unless prior written permission is obtained
  * from Adobe Systems Incorporated.
  */
-package com.adobe.xdm.event;
+package com.adobe.xdm.extensions.ims;
 
+import com.adobe.xdm.common.XdmContext;
+import com.adobe.xdm.external.ActivityStreamObject;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;

src/main/java/com/adobe/xdm/event/ImsUser.java → src/main/java/com/adobe/xdm/extensions/ims/ImsUser.java

@@ -14,8 +14,10 @@
  * is strictly forbidden unless prior written permission is obtained
  * from Adobe Systems Incorporated.
  */
-package com.adobe.xdm.event;
+package com.adobe.xdm.extensions.ims;
 
+import com.adobe.xdm.common.XdmContext;
+import com.adobe.xdm.external.ActivityStreamObject;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;

src/main/java/com/adobe/xdm/event/ActivityStreamObject.java → src/main/java/com/adobe/xdm/external/ActivityStreamObject.java

@@ -14,7 +14,7 @@
  * is strictly forbidden unless prior written permission is obtained
  * from Adobe Systems Incorporated.
  */
-package com.adobe.xdm.event;
+package com.adobe.xdm.external;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;

src/test/java/com/adobe/xdm/event/SerializationTest.java

@@ -18,6 +18,14 @@
 
 import static org.junit.Assert.assertTrue;
 
+import com.adobe.xdm.Xdm;
+import com.adobe.xdm.assets.Asset;
+import com.adobe.xdm.content.ContentRepository;
+import com.adobe.xdm.content.Page;
+import com.adobe.xdm.extensions.aem.AemUser;
+import com.adobe.xdm.extensions.aem.OsgiEvent;
+import com.adobe.xdm.extensions.ims.ImsOrg;
+import com.adobe.xdm.extensions.ims.ImsUser;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.File;
 import java.io.IOException;