Merge branch 'master' into mvc-theme-integration

ccm-cms/pom.xml

@@ -79,12 +79,12 @@
         <dependency>
             <groupId>org.eclipse.krazo</groupId>
             <artifactId>krazo-core</artifactId>
-            <scope>provided</scope>
+            <!--<scope>provided</scope>-->
         </dependency>
         <dependency>
             <groupId>org.eclipse.krazo.ext</groupId>
             <artifactId>krazo-freemarker</artifactId>
-            <scope>provided</scope>
+            <!--<scope>provided</scope>-->
         </dependency>
         
         <dependency>
@@ -443,6 +443,7 @@
                                 </goals>
                                 <phase>pre-integration-test</phase>
                                 <configuration>
+                                    <javaOpts>-Xms64m -Xmx2048M -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=2048m</javaOpts>
                                     <stdout>System.out</stdout>
                                 </configuration>
                             </execution>

ccm-cms/src/main/java/com/arsdigita/cms/ui/CMSDHTMLEditor.java

@@ -23,7 +23,7 @@ import com.arsdigita.bebop.parameters.ParameterModel;
 import com.arsdigita.bebop.parameters.StringParameter;
 import com.arsdigita.cms.CMS;
 
-import org.arsdigita.cms.CMSConfig;
+import org.librecms.CMSConfig;
 import org.libreccm.cdi.utils.CdiUtil;
 import org.libreccm.l10n.GlobalizationHelper;
 import org.librecms.contentsection.ContentSection;

ccm-cms/src/main/java/com/arsdigita/cms/ui/ContentItemPage.java

@@ -60,7 +60,7 @@ import com.arsdigita.xml.Element;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.arsdigita.cms.CMSConfig;
+import org.librecms.CMSConfig;
 import org.libreccm.cdi.utils.CdiUtil;
 import org.librecms.CmsConstants;
 import org.librecms.contentsection.ContentItem;

ccm-cms/src/main/java/com/arsdigita/cms/ui/ContentSectionPage.java

@@ -50,7 +50,7 @@ import com.arsdigita.util.Assert;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.arsdigita.cms.CMSConfig;
+import org.librecms.CMSConfig;
 import org.libreccm.cdi.utils.CdiUtil;
 import org.libreccm.security.PermissionChecker;
 import org.librecms.CmsConstants;

ccm-cms/src/main/java/com/arsdigita/cms/ui/assets/AssetPane.java

@@ -85,7 +85,7 @@ import org.librecms.contentsection.Folder;
 
 import java.util.List;
 
-import org.arsdigita.cms.CMSConfig;
+import org.librecms.CMSConfig;
 import org.libreccm.categorization.CategoryManager;
 import org.libreccm.core.CcmObject;
 import org.libreccm.core.UnexpectedErrorException;

ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/AuthoringKitWizard.java

@@ -62,7 +62,7 @@ import java.util.Objects;
 import java.util.ResourceBundle;
 
 import org.apache.logging.log4j.LogManager;
-import org.arsdigita.cms.CMSConfig;
+import org.librecms.CMSConfig;
 import org.libreccm.cdi.utils.CdiUtil;
 import org.libreccm.configuration.ConfigurationManager;
 import org.libreccm.core.UnexpectedErrorException;

ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/BasicPageForm.java

@@ -39,7 +39,7 @@ import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.globalization.GlobalizedMessage;
 import com.arsdigita.util.Assert;
 
-import org.arsdigita.cms.CMSConfig;
+import org.librecms.CMSConfig;
 import org.libreccm.cdi.utils.CdiUtil;
 import org.libreccm.workflow.Workflow;
 import org.librecms.CmsConstants;

ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/CategoryWidget.java

@@ -32,7 +32,7 @@ import org.libreccm.categorization.Category;
 import com.arsdigita.cms.CMS;
 import com.arsdigita.kernel.KernelConfig;
 
-import org.arsdigita.cms.CMSConfig;
+import org.librecms.CMSConfig;
 import org.libreccm.categorization.CategoryRepository;
 import org.libreccm.cdi.utils.CdiUtil;
 import org.librecms.contentsection.ContentSection;

ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/ItemCategoryStep.java

@@ -34,7 +34,7 @@ import com.arsdigita.cms.CMS;
 import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.util.Classes;
 
-import org.arsdigita.cms.CMSConfig;
+import org.librecms.CMSConfig;
 import org.libreccm.core.UnexpectedErrorException;
 import org.librecms.CmsConstants;
 import org.librecms.ui.authoring.ContentItemAuthoringStep;

ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/PageTextForm.java

@@ -20,7 +20,7 @@ import com.arsdigita.bebop.form.TextArea;
 import com.arsdigita.cms.ui.CMSDHTMLEditor;
 import com.arsdigita.globalization.GlobalizedMessage;
 
-import org.arsdigita.cms.CMSConfig;
+import org.librecms.CMSConfig;
 import org.libreccm.l10n.LocalizedString;
 import org.librecms.CmsConstants;
 

ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/TextBody.java

@@ -33,7 +33,7 @@ import com.arsdigita.cms.ui.SecurityPropertyEditor;
 import com.arsdigita.globalization.GlobalizedMessage;
 import com.arsdigita.toolbox.ui.DomainObjectPropertySheet;
 
-import org.arsdigita.cms.CMSConfig;
+import org.librecms.CMSConfig;
 import org.libreccm.l10n.LocalizedString;
 import org.librecms.CmsConstants;
 

ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/article/ArticlePropertyForm.java

@@ -36,7 +36,7 @@ import com.arsdigita.cms.ui.authoring.SelectedLanguageUtil;
 import com.arsdigita.globalization.GlobalizedMessage;
 import com.arsdigita.kernel.KernelConfig;
 
-import org.arsdigita.cms.CMSConfig;
+import org.librecms.CMSConfig;
 import org.libreccm.cdi.utils.CdiUtil;
 import org.librecms.CmsConstants;
 import org.librecms.contentsection.ContentItemRepository;

ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/article/GenericArticlePropertiesStep.java

@@ -31,7 +31,7 @@ import com.arsdigita.cms.ui.authoring.SimpleEditStep;
 import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess;
 import com.arsdigita.globalization.GlobalizedMessage;
 
-import org.arsdigita.cms.CMSConfig;
+import org.librecms.CMSConfig;
 import org.librecms.CmsConstants;
 import org.librecms.contentsection.ContentItem;
 

ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleCreateForm.java

@@ -38,7 +38,7 @@ import com.arsdigita.globalization.GlobalizedMessage;
 
 import java.util.Date;
 
-import org.arsdigita.cms.CMSConfig;
+import org.librecms.CMSConfig;
 import org.libreccm.cdi.utils.CdiUtil;
 import org.librecms.CmsConstants;
 import org.librecms.contentsection.ContentItemRepository;

ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleEdit.java

@@ -31,7 +31,7 @@ import com.arsdigita.cms.ui.authoring.SimpleEditStep;
 import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess;
 import com.arsdigita.globalization.GlobalizedMessage;
 
-import org.arsdigita.cms.CMSConfig;
+import org.librecms.CMSConfig;
 import org.libreccm.cdi.utils.CdiUtil;
 import org.libreccm.configuration.ConfigurationManager;
 import org.librecms.CmsConstants;

ccm-cms/src/main/java/com/arsdigita/cms/ui/authoring/multipartarticle/MultiPartArticleForm.java

@@ -49,7 +49,7 @@ import java.util.Locale;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.arsdigita.cms.CMSConfig;
+import org.librecms.CMSConfig;
 import org.libreccm.cdi.utils.CdiUtil;
 import org.librecms.CmsConstants;
 import org.librecms.contentsection.ContentItemManager;

ccm-cms/src/main/java/com/arsdigita/cms/ui/cse/ContentSoonExpiredPaneController.java

@@ -20,7 +20,7 @@ package com.arsdigita.cms.ui.cse;
 
 import com.arsdigita.bebop.table.RowData;
 
-import org.arsdigita.cms.CMSConfig;
+import org.librecms.CMSConfig;
 import org.libreccm.auditing.CcmRevision;
 import org.libreccm.configuration.ConfigurationManager;
 import org.libreccm.l10n.GlobalizationHelper;

ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/FolderManipulator.java

@@ -69,7 +69,7 @@ import org.apache.logging.log4j.Logger;
 import java.util.Arrays;
 import java.util.List;
 
-import org.arsdigita.cms.CMSConfig;
+import org.librecms.CMSConfig;
 import org.libreccm.categorization.Category;
 import org.libreccm.categorization.CategoryManager;
 import org.libreccm.cdi.utils.CdiUtil;

ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/ItemLifecycleAdminController.java

@@ -22,7 +22,7 @@ import com.arsdigita.cms.ui.ContentItemPage;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.arsdigita.cms.CMSConfig;
+import org.librecms.CMSConfig;
 import org.libreccm.categorization.Categorization;
 import org.libreccm.categorization.Category;
 import org.libreccm.configuration.ConfigurationManager;

ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/ItemLifecycleItemPane.java

@@ -55,7 +55,7 @@ import com.arsdigita.xml.Element;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.arsdigita.cms.CMSConfig;
+import org.librecms.CMSConfig;
 import org.libreccm.cdi.utils.CdiUtil;
 import org.libreccm.l10n.GlobalizationHelper;
 import org.libreccm.security.PermissionChecker;

ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/ItemLifecycleSelectForm.java

@@ -52,7 +52,7 @@ import com.arsdigita.web.URL;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.arsdigita.cms.CMSConfig;
+import org.librecms.CMSConfig;
 import org.libreccm.cdi.utils.CdiUtil;
 import org.libreccm.l10n.GlobalizationHelper;
 import org.libreccm.security.Shiro;

ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/ItemPhaseTableModel.java

@@ -21,7 +21,7 @@ package com.arsdigita.cms.ui.lifecycle;
 import com.arsdigita.bebop.table.TableModel;
 import com.arsdigita.globalization.GlobalizedMessage;
 
-import org.arsdigita.cms.CMSConfig;
+import org.librecms.CMSConfig;
 import org.libreccm.cdi.utils.CdiUtil;
 import org.libreccm.l10n.GlobalizationHelper;
 import org.librecms.CmsConstants;

ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/TaskFinishForm.java

@@ -44,7 +44,7 @@ import org.apache.logging.log4j.Logger;
 import java.util.Optional;
 
 import org.apache.logging.log4j.LogManager;
-import org.arsdigita.cms.CMSConfig;
+import org.librecms.CMSConfig;
 import org.libreccm.cdi.utils.CdiUtil;
 import org.libreccm.configuration.ConfigurationManager;
 import org.libreccm.security.PermissionChecker;

ccm-cms/src/main/java/com/arsdigita/london/terms/ui/TermWidget.java

@@ -41,7 +41,7 @@ import org.libreccm.categorization.Domain;
 import com.arsdigita.xml.Element;
 import com.arsdigita.xml.XML;
 
-import org.arsdigita.cms.CMSConfig;
+import org.librecms.CMSConfig;
 import org.libreccm.cdi.utils.CdiUtil;
 import org.libreccm.l10n.GlobalizationHelper;
 

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

@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.arsdigita.cms;
+package org.librecms;
 
 import com.arsdigita.bebop.form.DHTMLEditor;
 import com.arsdigita.cms.ui.authoring.ItemCategoryExtension;

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

@@ -96,7 +96,7 @@ import java.util.Properties;
         )
     },
     configurations = {
-        org.arsdigita.cms.CMSConfig.class
+        org.librecms.CMSConfig.class
     },
     pageModelComponentModels = {
         @PageModelComponentModel(

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

@@ -48,7 +48,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.arsdigita.cms.CMSConfig;
+import org.librecms.CMSConfig;
 import org.libreccm.cdi.utils.CdiUtil;
 import org.libreccm.l10n.GlobalizationHelper;
 import org.libreccm.security.PermissionChecker;

ccm-cms/src/test/java/org/librecms/contentsection/AssetManagerIT.java

@@ -60,8 +60,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
-
 
 /**
  * Tests for the {@link AssetManager}.
@@ -127,9 +126,11 @@ public class AssetManagerIT {
             .addAsResource(
                 "configs/org/librecms/contentsection/ContentItemManagerTest/log4j2.xml",
                 "log4j2.xml")
-            .addAsResource("test-persistence.xml",
+            .addAsResource(
-                           "META-INF/persistence.xml")
+                "test-persistence.xml", "META-INF/persistence.xml"
+            )
             .addAsWebInfResource("test-web.xml", "web.xml")
+            .addAsResource(EmptyAsset.INSTANCE, "META-INF/beans.xml")
             .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml");
     }
 
@@ -167,7 +168,7 @@ public class AssetManagerIT {
         "datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
     @ShouldMatchDataSet(
         value
-            = "datasets/org/librecms/contentsection/AssetManagerTest/after-share.xml",
+        = "datasets/org/librecms/contentsection/AssetManagerTest/after-share.xml",
         excludeColumns = {"asset_id",
                           "categorization_id",
                           "id",

ccm-cms/src/test/java/org/librecms/contentsection/AssetRepositoryIT.java

@@ -19,6 +19,7 @@
 package org.librecms.contentsection;
 
 import static org.libreccm.testutils.DependenciesHelpers.getCcmCoreDependencies;
+import static org.libreccm.testutils.DependenciesHelpers.getModuleDependencies;
 
 import org.apache.shiro.subject.ExecutionException;
 import org.apache.shiro.subject.Subject;
@@ -61,7 +62,8 @@ import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
+
 
 /**
  * Tests for the {@link AssetRepository}.
@@ -117,16 +119,20 @@ public class AssetRepositoryIT {
     public static WebArchive createDeployment() {
         return ShrinkWrap
             .create(WebArchive.class,
-                    "LibreCCM-org.librecms.contentsection.AssetRepositoryTest.war")
+                    "LibreCCM-org.librecms.contentsection.AssetRepositoryTest.war"
+            )
             .addPackages(true, "com.arsdigita", "org.libreccm", "org.librecms")
             .addAsLibraries(getCcmCoreDependencies())
             .addAsResource("configs/shiro.ini", "shiro.ini")
             .addAsResource(
                 "configs/org/librecms/contentsection/ContentItemManagerTest/log4j2.xml",
-                "log4j2.xml")
+                "log4j2.xml"
-            .addAsResource("test-persistence.xml",
+            )
-                           "META-INF/persistence.xml")
+            .addAsResource(
+                "test-persistence.xml", "META-INF/persistence.xml"
+            )
             .addAsWebInfResource("test-web.xml", "web.xml")
+            .addAsResource(EmptyAsset.INSTANCE, "META-INF/beans.xml")
             .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml");
     }
 

ccm-cms/src/test/java/org/librecms/contentsection/AttachmentListManagerIT.java

@@ -53,7 +53,7 @@ import org.jboss.arquillian.persistence.TestExecutionPhase;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Tests for the {@link AttachmentListManager}.
@@ -120,6 +120,7 @@ public class AttachmentListManagerIT {
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")
             .addAsWebInfResource("test-web.xml", "web.xml")
+            .addAsResource(EmptyAsset.INSTANCE, "META-INF/beans.xml")
             .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml");
     }
 

ccm-cms/src/test/java/org/librecms/contentsection/ContentItemL10NManagerIT.java

@@ -52,7 +52,7 @@ import org.jboss.arquillian.persistence.TestExecutionPhase;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Verifies the methods of the {@link ContentItemL10NManager}.
@@ -122,6 +122,7 @@ public class ContentItemL10NManagerIT {
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")
             .addAsWebInfResource("test-web.xml", "web.xml")
+             .addAsResource(EmptyAsset.INSTANCE, "META-INF/beans.xml")
             .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml");
     }
 

ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerIT.java

@@ -63,7 +63,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Tests for the {@link ContentItemManager}.
@@ -145,6 +145,8 @@ public class ContentItemManagerIT {
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")
             .addAsWebInfResource("test-web.xml", "web.xml")
+            .addAsResource(EmptyAsset.INSTANCE, "META-INF/beans.xml")
+            .addAsResource(EmptyAsset.INSTANCE, "META-INF/beans.xml")
             .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml");
     }
 

ccm-cms/src/test/java/org/librecms/contentsection/ContentItemRepositoryIT.java

@@ -122,6 +122,7 @@ public class ContentItemRepositoryIT {
                            "META-INF/persistence.xml")
             .addAsResource("configs/shiro.ini", "shiro.ini")
             .addAsWebInfResource("test-web.xml", "web.xml")
+            .addAsResource(EmptyAsset.INSTANCE, "META-INF/beans.xml")
             .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml");
     }
 

ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerIT.java

@@ -63,7 +63,7 @@ import org.librecms.lifecycle.LifecycleDefinitionRepository;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Tests for the {@link ContentSectionManager}.
@@ -141,6 +141,7 @@ public class ContentSectionManagerIT {
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")
             .addAsWebInfResource("test-web.xml", "WEB-INF/web.xml")
+            .addAsResource(EmptyAsset.INSTANCE, "META-INF/beans.xml")
             .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml");
     }
 

ccm-cms/src/test/java/org/librecms/contentsection/FolderManagerIT.java

@@ -52,7 +52,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 
 /**
@@ -113,6 +113,7 @@ public class FolderManagerIT {
                            "META-INF/persistence.xml")
             .addAsResource("configs/shiro.ini", "shiro.ini")
             .addAsWebInfResource("test-web.xml", "web.xml")
+             .addAsResource(EmptyAsset.INSTANCE, "META-INF/beans.xml")
             .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml");
     }
 

ccm-cms/src/test/java/org/librecms/contentsection/ItemAttachmentManagerIT.java

@@ -51,8 +51,7 @@ import org.jboss.arquillian.persistence.TestExecutionPhase;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
-
 
 /**
  * Tests for the {@link ItemAttachmentManager}.
@@ -118,7 +117,7 @@ public class ItemAttachmentManagerIT {
         return ShrinkWrap
             .create(WebArchive.class,
                     "LibreCCM-org.librecms.assets.AssetManagerTest.war")
-           .addPackages(true, "com.arsdigita", "org.libreccm", "org.librecms")
+            .addPackages(true, "com.arsdigita", "org.libreccm", "org.librecms")
             .addAsLibraries(getCcmCoreDependencies())
             .addAsResource("configs/shiro.ini", "shiro.ini")
             .addAsResource(
@@ -127,6 +126,7 @@ public class ItemAttachmentManagerIT {
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")
             .addAsWebInfResource("test-web.xml", "web.xml")
+            .addAsResource(EmptyAsset.INSTANCE, "META-INF/beans.xml")
             .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml");
     }
 

ccm-core/pom.xml

@@ -110,12 +110,12 @@
         <dependency>
             <groupId>org.eclipse.krazo</groupId>
             <artifactId>krazo-core</artifactId>
-            <scope>provided</scope>
+            <!--<scope>provided</scope>-->
         </dependency>
         <dependency>
             <groupId>org.eclipse.krazo.ext</groupId>
             <artifactId>krazo-freemarker</artifactId>
-            <scope>provided</scope>
+            <!--<scope>provided</scope>-->
         </dependency>
 
         <!--

ccm-core/src/main/java/org/libreccm/core/CcmObject.java

@@ -29,11 +29,11 @@ import org.libreccm.categorization.Category;
 import org.libreccm.categorization.CategoryManager;
 import org.libreccm.security.Permission;
 
-import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -43,6 +43,20 @@ import java.util.Objects;
 import static org.libreccm.core.CoreConstants.CORE_XML_NS;
 import static org.libreccm.core.CoreConstants.DB_SCHEMA;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
+import javax.persistence.Table;
+
 /**
  * Root class of all entities in LibreCCM which need categorisation and
  * permission services.

ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryIT.java

@@ -18,7 +18,8 @@
  */
 package org.libreccm.core;
 
-import static org.hamcrest.CoreMatchers.*;
+
+import static org.libreccm.testutils.DependenciesHelpers.getModuleDependencies;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.ShouldThrowException;
@@ -46,16 +47,18 @@ import javax.inject.Inject;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
-import static org.junit.Assert.*;
-
-import static org.libreccm.testutils.DependenciesHelpers.*;
-
 import org.jboss.arquillian.persistence.CleanupUsingScript;
 
 import java.util.Optional;
 
 import org.jboss.arquillian.persistence.TestExecutionPhase;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.nullValue;
+
 /**
  * Tests for the {@link CcmObjectRepository} which is the foundation for many
  * other repositories in LibreCCM.
@@ -111,6 +114,7 @@ public class CcmObjectRepositoryIT {
             )
             .addAsResource("configs/shiro.ini", "shiro.ini")
             .addAsWebInfResource("test-web.xml", "web.xml")
+            .addAsResource(EmptyAsset.INSTANCE, "META-INF/beans.xml")
             .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml");
     }
 

ccm-core/src/test/java/org/libreccm/security/UserRepositoryIT.java

@@ -35,8 +35,6 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.After;
 import org.junit.AfterClass;
 
-import static org.junit.Assert.*;
-
 import static org.libreccm.testutils.DependenciesHelpers.*;
 
 import org.jboss.arquillian.persistence.CleanupUsingScript;
@@ -54,6 +52,7 @@ import javax.persistence.PersistenceContext;
 
 import org.jboss.arquillian.persistence.TestExecutionPhase;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;

ccm-shortcuts/pom.xml

@@ -81,12 +81,12 @@
         <dependency>
             <groupId>org.eclipse.krazo</groupId>
             <artifactId>krazo-core</artifactId>
-            <scope>provided</scope>
+            <!--<scope>provided</scope>-->
         </dependency>
         <dependency>
             <groupId>org.eclipse.krazo.ext</groupId>
             <artifactId>krazo-freemarker</artifactId>
-            <scope>provided</scope>
+            <!--<scope>provided</scope>-->
         </dependency>
         
         <dependency>

ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutManagerIT.java

@@ -41,6 +41,7 @@ import org.jboss.arquillian.persistence.UsingDataSet;
 import org.jboss.arquillian.transaction.api.annotation.TransactionMode;
 import org.jboss.arquillian.transaction.api.annotation.Transactional;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -50,8 +51,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.libreccm.security.Shiro;
 
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  *
@@ -111,13 +114,16 @@ public class ShortcutManagerIT {
             .addPackage(org.libreccm.categorization.Categorization.class
                 .getPackage())
             .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage())
-            .addPackage(org.libreccm.configuration.Configuration.class
+            .addPackage(
-                .getPackage())
+                org.libreccm.configuration.Configuration.class.getPackage()
+            )
             .addPackage(org.libreccm.core.CcmCore.class.getPackage())
-            .addPackage(org.libreccm.jpa.EntityManagerProducer.class
+            .addPackage(
-                .getPackage())
+                org.libreccm.jpa.EntityManagerProducer.class.getPackage()
-            .addPackage(org.libreccm.l10n.LocalizedString.class
+            )
-                .getPackage())
+            .addPackage(
+                org.libreccm.l10n.LocalizedString.class.getPackage()
+            )
             .addPackage(org.libreccm.security.Permission.class.getPackage())
             .addPackage(org.libreccm.web.CcmApplication.class.getPackage())
             .addPackage(org.libreccm.workflow.Workflow.class.getPackage())
@@ -132,6 +138,7 @@ public class ShortcutManagerIT {
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")
             .addAsWebInfResource("test-web.xml", "web.xml")
+            .addAsResource(EmptyAsset.INSTANCE, "META-INF/beans.xml")
             .addAsResource("test-beans.xml", "META-INF/beans.xml");
     }
 

ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutRepositoryIT.java

@@ -19,7 +19,6 @@
 package org.libreccm.shortcuts;
 
 import static org.libreccm.testutils.DependenciesHelpers.getCcmCoreDependencies;
-import static org.libreccm.testutils.DependenciesHelpers.getModuleDependencies;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
@@ -52,7 +51,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  *
@@ -107,22 +106,23 @@ public class ShortcutRepositoryIT {
                 "LibreCCM-org.libreccm.shortcuts.ShortcutRepositoryTest-web.war"
             )
             .addPackage(org.libreccm.auditing.CcmRevision.class.getPackage())
-            .addPackage(org.libreccm.categorization.Categorization.class
+            .addPackage(
-                .getPackage())
+                org.libreccm.categorization.Categorization.class.getPackage()
-            .addPackage(org.libreccm.configuration.Configuration.class
+            )
-                .getPackage())
+            .addPackage(
+                org.libreccm.configuration.Configuration.class.getPackage()
+            )
             .addPackage(org.libreccm.core.CcmCore.class.getPackage())
-            .addPackage(org.libreccm.jpa.EntityManagerProducer.class
+            .addPackage(
-                .getPackage())
+                org.libreccm.jpa.EntityManagerProducer.class.getPackage()
-            .addPackage(org.libreccm.l10n.LocalizedString.class
+            )
-                .getPackage())
+            .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage())
             .addPackage(org.libreccm.security.Permission.class.getPackage())
             .addPackage(org.libreccm.web.CcmApplication.class.getPackage())
             .addPackage(org.libreccm.workflow.Workflow.class.getPackage())
             .addClass(org.libreccm.imexport.Exportable.class)
             .addClass(org.libreccm.shortcuts.Shortcut.class)
             .addClass(org.libreccm.shortcuts.ShortcutRepository.class)
-            .addAsLibraries(getModuleDependencies())
             .addAsLibraries(getCcmCoreDependencies())
             .addAsResource(
                 "test-persistence.xml", "META-INF/persistence.xml"

pom.xml

@@ -839,13 +839,13 @@
             <dependency>
                 <groupId>org.wildfly.arquillian</groupId>
                 <artifactId>wildfly-arquillian-container-managed</artifactId>
-                <version>2.2.0.Final</version>
+                <version>3.0.1.Final</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.wildfly.arquillian</groupId>
                 <artifactId>wildfly-arquillian-container-remote</artifactId>
-                <version>2.2.0.Final</version>
+                <version>3.0.1.Final</version>
                 <scope>test</scope>
             </dependency>
 
@@ -864,7 +864,7 @@
             <dependency>
                 <groupId>org.jboss.logmanager</groupId>
                 <artifactId>jboss-logmanager</artifactId>
-                <version>2.1.16.Final</version>
+                <version>2.1.17.Final</version>
                 <scope>test</scope>
             </dependency>