CCM NG: Fixing test failures

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

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

@@ -189,7 +189,7 @@ public class ContentTypeRepository
         @RequiresPrivilege(AdminPrivileges.ADMINISTER_CONTENT_TYPES)
         final ContentType type) {
         
-        if (isContentTypeInUse(type)) {
+            if (isContentTypeInUse(type)) {
             throw new IllegalArgumentException(String.format(
                 "Contenttype \"%s\" in section \"%s\" is in use and can't be"
                     + "deleted.",

ccm-cms/src/main/resources/META-INF/beans.xml

@@ -5,6 +5,10 @@
                            http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
        bean-discovery-mode="all">
        
+    <interceptors>
+        <class>org.libreccm.security.AuthorizationInterceptor</class>
+    </interceptors>
+
     
 </beans>
 

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

@@ -102,8 +102,8 @@ public class ContentTypeRepositoryTest {
     public static WebArchive createDeployment() {
         return ShrinkWrap
             .create(WebArchive.class,
-                    "LibreCCM-org.librecms.contentsection.ContentTypeRepositoryTest.war").
+                    "LibreCCM-org.librecms.contentsection.ContentTypeRepositoryTest.war")
-            addClass(com.arsdigita.bebop.AbstractSingleSelectionModel.class)
+            .addClass(com.arsdigita.bebop.AbstractSingleSelectionModel.class)
             .addClass(com.arsdigita.bebop.BaseLink.class)
             .addClass(com.arsdigita.bebop.BasePage.class)
             .addClass(com.arsdigita.bebop.BebopConfig.class)
@@ -174,16 +174,16 @@ public class ContentTypeRepositoryTest {
             .addClass(com.arsdigita.bebop.parameters.BitSetParameter.class)
             .addClass(com.arsdigita.bebop.parameters.EmailParameter.class)
             .addClass(
-                com.arsdigita.bebop.parameters.GlobalizedParameterListener.class).
+                com.arsdigita.bebop.parameters.GlobalizedParameterListener.class)
-            addClass(
+            .addClass(
                 com.arsdigita.bebop.parameters.NotEmptyValidationListener.class)
             .addClass(
                 com.arsdigita.bebop.parameters.NotNullValidationListener.class)
             .addClass(com.arsdigita.bebop.parameters.ParameterData.class)
             .addClass(com.arsdigita.bebop.parameters.ParameterModel.class)
             .addClass(
-                com.arsdigita.bebop.parameters.StringLengthValidationListener.class).
+                com.arsdigita.bebop.parameters.StringLengthValidationListener.class)
-            addClass(com.arsdigita.bebop.parameters.StringParameter.class)
+            .addClass(com.arsdigita.bebop.parameters.StringParameter.class)
             .addClass(com.arsdigita.bebop.parameters.URLParameter.class)
             .addClass(com.arsdigita.bebop.util.Attributes.class)
             .addClass(com.arsdigita.bebop.util.BebopConstants.class)
@@ -196,8 +196,8 @@ public class ContentTypeRepositoryTest {
             .addClass("com.arsdigita.dispatcher.DispatcherConstants")
             .addClass(com.arsdigita.dispatcher.DispatcherHelper.class)
             .addClass(com.arsdigita.dispatcher.InitialRequestContext.class)
-            .addClass(com.arsdigita.dispatcher.MultipartHttpServletRequest.class).
+            .addClass(com.arsdigita.dispatcher.MultipartHttpServletRequest.class)
-            addClass(com.arsdigita.dispatcher.RedirectException.class)
+            .addClass(com.arsdigita.dispatcher.RedirectException.class)
             .addClass(com.arsdigita.dispatcher.RequestContext.class)
             .addClass(com.arsdigita.globalization.Globalization.class)
             .addClass(com.arsdigita.globalization.Globalized.class)
@@ -211,8 +211,8 @@ public class ContentTypeRepositoryTest {
             .addClass(com.arsdigita.mail.Mail.class)
             .addClass(com.arsdigita.mail.MailConfig.class)
             .addClass("com.arsdigita.mail.MimeMessage")
-            .addClass(com.arsdigita.templating.ApplicationPatternGenerator.class).
+            .addClass(com.arsdigita.templating.ApplicationPatternGenerator.class)
-            addClass(com.arsdigita.templating.HostPatternGenerator.class)
+            .addClass(com.arsdigita.templating.HostPatternGenerator.class)
             .addClass(com.arsdigita.templating.LocalePatternGenerator.class)
             .addClass("com.arsdigita.templating.LoggingErrorListener")
             .addClass(com.arsdigita.templating.OutputTypePatternGenerator.class)
@@ -226,18 +226,18 @@ public class ContentTypeRepositoryTest {
             .addClass(com.arsdigita.templating.TemplatingConfig.class)
             .addClass(com.arsdigita.templating.URLPatternGenerator.class)
             .addClass(com.arsdigita.templating.WebAppPatternGenerator.class)
-            .addClass(com.arsdigita.templating.WrappedTransformerException.class).
+            .addClass(com.arsdigita.templating.WrappedTransformerException.class)
-            addClass(com.arsdigita.templating.XSLParameterGenerator.class)
+            .addClass(com.arsdigita.templating.XSLParameterGenerator.class)
             .addClass(com.arsdigita.templating.XSLTemplate.class)
             .addClass(com.arsdigita.ui.SimplePage.class)
             .addClass("com.arsdigita.ui.SimplePageLayout")
             .addClass(com.arsdigita.ui.UI.class)
             .addClass(com.arsdigita.ui.UIConfig.class)
             .addClass(
-                com.arsdigita.ui.admin.applications.AbstractAppInstanceForm.class).
+                com.arsdigita.ui.admin.applications.AbstractAppInstanceForm.class)
-            addClass(
+            .addClass(
-                com.arsdigita.ui.admin.applications.AbstractAppSettingsPane.class).
+                com.arsdigita.ui.admin.applications.AbstractAppSettingsPane.class)
-            addClass(com.arsdigita.ui.login.ChangePasswordForm.class)
+            .addClass(com.arsdigita.ui.login.ChangePasswordForm.class)
             .addClass("com.arsdigita.ui.login.DynamicLink")
             .addClass(com.arsdigita.ui.login.EmailInitListener.class)
             .addClass(com.arsdigita.ui.login.LoginConstants.class)
@@ -327,6 +327,8 @@ public class ContentTypeRepositoryTest {
             .addClass(org.libreccm.core.UnexpectedErrorException.class)
             .addClass(org.libreccm.jpa.EntityManagerProducer.class)
             .addClass(org.libreccm.l10n.GlobalizationHelper.class)
+            .addClass(org.libreccm.l10n.GlobalizedMessagesUtil.class)
+            .addClass(org.libreccm.l10n.LocalizedTextsUtil.class)
             .addClass(org.libreccm.l10n.LocalizedString.class)
             .addClass(org.libreccm.modules.CcmModule.class)
             .addClass(org.libreccm.modules.InitEvent.class)
@@ -395,8 +397,8 @@ public class ContentTypeRepositoryTest {
             .addClass(org.librecms.contentsection.ContentItem.class)
             .addClass(org.librecms.contentsection.ContentItemVersion.class)
             .addClass(org.librecms.contentsection.ContentSection.class)
-            .addClass(org.librecms.contentsection.ContentSectionRepository.class).
+            .addClass(org.librecms.contentsection.ContentSectionRepository.class)
-            addClass(org.librecms.contentsection.ContentType.class)
+            .addClass(org.librecms.contentsection.ContentType.class)
             .addClass(org.librecms.contentsection.ContentTypeMode.class)
             .addClass(org.librecms.contentsection.ContentTypeRepository.class)
             .addClass(org.librecms.contentsection.Folder.class)

ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_cms_schema.sql

@@ -1490,7 +1490,7 @@ create schema CCM_CORE;
 
     create table CCM_CORE.WORKFLOWS (
         WORKFLOW_ID bigint not null,
-        abstract_workflow boolean,
+        ABSTRACT_WORKFLOW boolean,
         ACTIVE boolean,
         WORKFLOW_STATE varchar(255),
         TASKS_STATE varchar(255),

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-contenttype.xml

@@ -105,18 +105,17 @@
     
     <ccm_core.workflows workflow_id="-14001"
                         uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52"
-                        active="false" />
+                        active="false" 
+                        abstract_workflow="true" />
     <ccm_core.workflows workflow_id="-14002"
                         uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7"
-                        active="false" />
+                        active="false" 
+                        abstract_workflow="true" />
     <ccm_core.workflows workflow_id="-14003"
                         uuid="3953c9be-f8ee-4015-9911-a560c762b052"
-                        active="false" />
+                        active="false" 
+                        abstract_workflow="true" />
     
-    <ccm_core.workflow_templates workflow_id="-14001" />
-    <ccm_core.workflow_templates workflow_id="-14002" />
-    <ccm_core.workflow_templates workflow_id="-14003" />
-
     <ccm_cms.folders object_id="-2100"
                      type="DOCUMENTS_FOLDER" />
     <ccm_cms.folders object_id="-2200"

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-role.xml

@@ -67,18 +67,17 @@
 
     <ccm_core.workflows workflow_id="-14001"
                         uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52"
-                        active="false" />
+                        active="false" 
+                        abstract_workflow="true" />
     <ccm_core.workflows workflow_id="-14002"
                         uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7"
-                        active="false" />
+                        active="false" 
+                        abstract_workflow="true" />
     <ccm_core.workflows workflow_id="-14003"
                         uuid="3953c9be-f8ee-4015-9911-a560c762b052"
-                        active="false" />
+                        active="false" 
-    
+                        abstract_workflow="true" />
-    <ccm_core.workflow_templates workflow_id="-14001" />
+ 
-    <ccm_core.workflow_templates workflow_id="-14002" />
-    <ccm_core.workflow_templates workflow_id="-14003" />
-
     <ccm_cms.folders object_id="-2100"
                      type="DOCUMENTS_FOLDER" />
     <ccm_cms.folders object_id="-2200"

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-create.xml

@@ -107,17 +107,16 @@
 
     <ccm_core.workflows workflow_id="-14001"
                         uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52"
-                        active="false" />
+                        active="false" 
+                        abstract_workflow="true" />
     <ccm_core.workflows workflow_id="-14002"
                         uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7"
-                        active="false" />
+                        active="false" 
+                        abstract_workflow="true" />
     <ccm_core.workflows workflow_id="-14003"
                         uuid="3953c9be-f8ee-4015-9911-a560c762b052"
-                        active="false" />
+                        active="false" 
-
+                        abstract_workflow="true" />
-    <ccm_core.workflow_templates workflow_id="-14001" />
-    <ccm_core.workflow_templates workflow_id="-14002" />
-    <ccm_core.workflow_templates workflow_id="-14003" />
     
     <ccm_cms.folders object_id="-2100"
                      type="DOCUMENTS_FOLDER" />

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-contenttype.xml

@@ -99,17 +99,16 @@
     
     <ccm_core.workflows workflow_id="-14001"
                         uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52"
-                        active="false" />
+                        active="false" 
+                        abstract_workflow="true" />
     <ccm_core.workflows workflow_id="-14002"
                         uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7"
-                        active="false" />
+                        active="false" 
+                        abstract_workflow="true" />
     <ccm_core.workflows workflow_id="-14003"
                         uuid="3953c9be-f8ee-4015-9911-a560c762b052"
-                        active="false" />
+                        active="false" 
-
+                        abstract_workflow="true" />
-    <ccm_core.workflow_templates workflow_id="-14001" />
-    <ccm_core.workflow_templates workflow_id="-14002" />
-    <ccm_core.workflow_templates workflow_id="-14003" />
     
     <ccm_cms.folders object_id="-2100"
                      type="DOCUMENTS_FOLDER" />

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-role.xml

@@ -102,17 +102,16 @@
     
     <ccm_core.workflows workflow_id="-14001"
                         uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52"
-                        active="false" />
+                        active="false" 
+                        abstract_workflow="true" />
     <ccm_core.workflows workflow_id="-14002"
                         uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7"
-                        active="false" />
+                        active="false" 
+                        abstract_workflow="true" />
     <ccm_core.workflows workflow_id="-14003"
                         uuid="3953c9be-f8ee-4015-9911-a560c762b052"
-                        active="false" />
+                        active="false" 
-
+                        abstract_workflow="true" />
-    <ccm_core.workflow_templates workflow_id="-14001" />
-    <ccm_core.workflow_templates workflow_id="-14002" />
-    <ccm_core.workflow_templates workflow_id="-14003" />
     
     <ccm_cms.folders object_id="-2100"
                      type="DOCUMENTS_FOLDER" />

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-rename.xml

@@ -68,17 +68,16 @@
 
     <ccm_core.workflows workflow_id="-14001"
                         uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52"
-                        active="false" />
+                        active="false" 
+                        abstract_workflow="true" />
     <ccm_core.workflows workflow_id="-14002"
                         uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7"
-                        active="false" />
+                        active="false" 
+                        abstract_workflow="true" />
     <ccm_core.workflows workflow_id="-14003"
                         uuid="3953c9be-f8ee-4015-9911-a560c762b052"
-                        active="false" />
+                        active="false" 
-
+                        abstract_workflow="true" />
-    <ccm_core.workflow_templates workflow_id="-14001" />
-    <ccm_core.workflow_templates workflow_id="-14002" />
-    <ccm_core.workflow_templates workflow_id="-14003" />
     
     <ccm_cms.folders object_id="-2100"
                      type="DOCUMENTS_FOLDER" />

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/data.xml

@@ -86,7 +86,7 @@
                               localized_value="info_assets" />
     
     <ccm_core.resources object_id="-1100" 
-                        created="2016-07-15" />
+                        created="2016-07-15" />abstract_workflow="true" 
     
     <ccm_core.resource_titles object_id="-1100" 
                               locale="en"
@@ -102,17 +102,16 @@
     
     <ccm_core.workflows workflow_id="-14001"
                         uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52"
-                        active="false" />
+                        active="false" 
+                        abstract_workflow="true" />
     <ccm_core.workflows workflow_id="-14002"
                         uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7"
-                        active="false" />
+                        active="false" 
+                        abstract_workflow="true" />
     <ccm_core.workflows workflow_id="-14003"
                         uuid="3953c9be-f8ee-4015-9911-a560c762b052"
-                        active="false" />
+                        active="false" 
-
+                        abstract_workflow="true" />
-    <ccm_core.workflow_templates workflow_id="-14001" />
-    <ccm_core.workflow_templates workflow_id="-14002" />
-    <ccm_core.workflow_templates workflow_id="-14003" />
     
     <ccm_cms.folders object_id="-2100"
                      type="DOCUMENTS_FOLDER" />