CCM NG: Package structure refactoring in ccm-cms

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@3699 8810af33-2d31-482b-a856-94f89814c4df

ccm-cms-types-article/src/main/java/org/librecms/article/Article.java

@@ -22,13 +22,13 @@ import static org.librecms.article.ArticleConstants.*;
 
 import org.hibernate.envers.Audited;
 
-import org.libreccm.cms.contentsection.ContentItem;
+import org.librecms.contentsection.ContentItem;
 
 import java.io.Serializable;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import org.libreccm.cms.contenttypes.GenericArticle;
+import org.librecms.contenttypes.GenericArticle;
 
 /**
  * This type simply exposes the {@link GenericArticle} type from the

ccm-cms/src/main/java/org/librecms/Cms.java

@@ -1,7 +1,7 @@
 /**
  * Add your license here, for example LGPL
  */
-package org.libreccm.cms;
+package org.librecms;
 
 import org.libreccm.modules.CcmModule;
 import org.libreccm.modules.InitEvent;

ccm-cms/src/main/java/org/librecms/CmsConstants.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.libreccm.cms;
+package org.librecms;
 
 /**
  *

ccm-cms/src/main/java/org/librecms/contentsection/ContentItem.java

@@ -16,11 +16,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.libreccm.cms.contentsection;
+package org.librecms.contentsection;
 
 import org.hibernate.envers.Audited;
 
-import static org.libreccm.cms.CmsConstants.*;
+import static org.librecms.CmsConstants.*;
 
 import org.libreccm.core.CcmObject;
 import org.libreccm.l10n.LocalizedString;

ccm-cms/src/main/java/org/librecms/contentsection/ContentItemMode.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.libreccm.cms.contentsection;
+package org.librecms.contentsection;
 
 /**
  *

ccm-cms/src/main/java/org/librecms/contentsection/ContentItemVersion.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.libreccm.cms.contentsection;
+package org.librecms.contentsection;
 
 /**
  *

ccm-cms/src/main/java/org/librecms/contentsection/ContentSection.java

@@ -16,9 +16,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.libreccm.cms.contentsection;
+package org.librecms.contentsection;
 
-import static org.libreccm.cms.CmsConstants.*;
+import static org.librecms.CmsConstants.*;
 
 import org.libreccm.core.Group;
 import org.libreccm.web.CcmApplication;

ccm-cms/src/main/java/org/librecms/contentsection/ContentType.java

@@ -16,9 +16,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.libreccm.cms.contentsection;
+package org.librecms.contentsection;
 
-import static org.libreccm.cms.CmsConstants.*;
+import static org.librecms.CmsConstants.*;
 
 import org.libreccm.core.CcmObject;
 import org.libreccm.l10n.LocalizedString;

ccm-cms/src/main/java/org/librecms/contenttypes/GenericArticle.java

@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.libreccm.cms.contenttypes;
+package org.librecms.contenttypes;
 
 import java.io.Serializable;
 import java.util.Objects;
@@ -28,9 +28,9 @@ import javax.persistence.JoinTable;
 import javax.persistence.Table;
 import org.hibernate.envers.Audited;
 
-import static org.libreccm.cms.CmsConstants.*;
+import static org.librecms.CmsConstants.*;
 
-import org.libreccm.cms.contentsection.ContentItem;
+import org.librecms.contentsection.ContentItem;
 import org.libreccm.l10n.LocalizedString;
 
 /**

ccm-cms/src/main/resources/META-INF/services/org.libreccm.modules.CcmModule

@@ -1 +1 @@
-org.libreccm.cms.Cms
+org.librecms.Cms

ccm-cms/src/main/resources/module-info/org.librecms.ccm-cms.properties

@@ -0,0 +1,4 @@
+groupId=${project.groupId}
+artifactId=${project.artifactId}
+version=${project.version}
+build.date=${timestamp}

ccm-cms/src/test/java/org/librecms/CmsTest.java

@@ -1,7 +1,9 @@
 /*
  * ToDo: Add your license
  */
-package org.libreccm.cms;
+package org.librecms;
+
+import org.librecms.Cms;
 
 import static org.hamcrest.CoreMatchers.*;