CCM NG/ccm-cms: ContentSectionManager + Tests

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

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

@@ -42,10 +42,13 @@ import javax.inject.Inject;
 import javax.persistence.EntityManager;
 import javax.persistence.TypedQuery;
 import javax.transaction.Transactional;
+
 import org.librecms.CmsConstants;
 
 import org.librecms.lifecycle.LifecycleDefinition;
 
+import java.util.Optional;
+
 import static org.librecms.CmsConstants.*;
 import static org.librecms.contentsection.ContentSection.*;
 
@@ -69,8 +72,9 @@ public class ContentSectionManager {
     @Inject
     private RoleRepository roleRepo;
 
-//    @Inject
+    @Inject
-//    private RoleManager roleManager;
+    private ContentTypeRepository typeRepo;
+
     @Inject
     private PermissionManager permissionManager;
 
@@ -106,6 +110,7 @@ public class ContentSectionManager {
 
         final Folder rootFolder = new Folder();
         rootFolder.setName(String.format("%s_root", name));
+        rootFolder.setType(FolderType.DOCUMENTS_FOLDER);
         rootFolder.getTitle().addValue(defautLocale, rootFolder.getName());
         rootFolder.setDisplayName(rootFolder.getName());
         rootFolder.setUuid(UUID.randomUUID().toString());
@@ -115,6 +120,7 @@ public class ContentSectionManager {
 
         final Folder rootAssetFolder = new Folder();
         rootAssetFolder.setName(String.format("%s_assets", name));
+        rootAssetFolder.setType(FolderType.ASSETS_FOLDER);
         rootAssetFolder.getTitle().addValue(defautLocale,
                                             rootAssetFolder.getName());
         rootAssetFolder.setDisplayName(rootAssetFolder.getName());
@@ -233,6 +239,15 @@ public class ContentSectionManager {
         final String roleName,
         final String... privileges) {
 
+        if (section == null) {
+            throw new IllegalArgumentException("Can't add a role to "
+                                                   + "section null.");
+        }
+
+        if (roleName == null || roleName.trim().isEmpty()) {
+            throw new IllegalArgumentException("No role name provided.");
+        }
+
         final Role role = new Role();
         role.setName(String.join("_", section.getLabel(), roleName));
         roleRepo.save(role);
@@ -261,6 +276,16 @@ public class ContentSectionManager {
         @RequiresPrivilege(PRIVILEGE_ADMINISTER_ROLES)
         final ContentSection section) {
 
+        if (section == null) {
+            throw new IllegalArgumentException("Can't add a role to "
+                                                   + "section null.");
+        }
+
+        if (role == null) {
+            throw new IllegalArgumentException("Can't add role null to a "
+                                                   + "content section.");
+        }
+
         section.addRole(role);
         sectionRepo.save(section);
     }
@@ -307,46 +332,6 @@ public class ContentSectionManager {
         permissions.forEach(p -> entityManager.remove(p));
     }
 
-    /**
-     * Associates a content type with a content section making the type
-     * available for use in the content section. This operation requires
-     * {@link CmsConstants#PRIVILEGE_ADMINISTER_CONTENT_TYPES} for the provided
-     * content section.
-     *
-     * @param type    The {@link ContentItem} class representing the type to
-     *                add.
-     * @param section The section to which to type is added.
-     */
-    @AuthorizationRequired
-    @Transactional(Transactional.TxType.REQUIRED)
-    public void addTypeToSection(
-        final Class<? extends ContentItem> type,
-        @RequiresPrivilege(PRIVILEGE_ADMINISTER_CONTENT_TYPES)
-        final ContentSection section) {
-
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Removes a content type from a content section. After this it is not
-     * possible to create new items of this type in the content section.
-     * Existing items are left untouched. This operation requires
-     * {@link CmsConstants#PRIVILEGE_ADMINISTER_CONTENT_TYPES} for the provided
-     * content section.
-     *
-     * @param type    The type to remove.
-     * @param section The section from which the type is removed.
-     */
-    @AuthorizationRequired
-    @Transactional(Transactional.TxType.REQUIRED)
-    public void removeTypeFromSection(
-        final ContentType type,
-        @RequiresPrivilege(PRIVILEGE_ADMINISTER_CONTENT_TYPES)
-        final ContentSection section) {
-
-        throw new UnsupportedOperationException();
-    }
-
     /**
      * Adds a lifecycle definition to a content section. This operation requires
      * {@link CmsConstants#PRIVILEGE_ADMINISTER_LIFECYLES} for the provided
@@ -447,7 +432,9 @@ public class ContentSectionManager {
 
     /**
      * Adds a new {@link ContentType} to a content section, making items of that
-     * type available in the content section.
+     * type available in the content section. This operation requires
+     * {@link CmsConstants#PRIVILEGE_ADMINISTER_CONTENT_TYPES} for the provided
+     * content section.
      *
      * @param type             The type to add (a subclass of
      *                         {@link ContentItem}.
@@ -465,13 +452,79 @@ public class ContentSectionManager {
      *
      * @return The new {@link ContentType} instance.
      */
+    @AuthorizationRequired
+    @Transactional(Transactional.TxType.REQUIRED)
     public ContentType addContentTypeToSection(
         final Class<? extends ContentItem> type,
+        @RequiresPrivilege(CmsConstants.PRIVILEGE_ADMINISTER_CONTENT_TYPES)
         final ContentSection section,
         final LifecycleDefinition defaultLifecycle,
         final WorkflowTemplate defaultWorkflow) {
 
-        throw new UnsupportedOperationException();
+        if (type == null) {
+            throw new IllegalArgumentException("Can't add null as content type "
+                                                   + "to a content section.");
+        }
+
+        if (section == null) {
+            throw new IllegalArgumentException("Can't add a content type"
+                                                   + "to section null.");
+        }
+
+        if (defaultLifecycle == null) {
+            throw new IllegalArgumentException("Can't create a content type "
+                                                   + "without a default lifecycle.");
+        }
+
+        if (defaultWorkflow == null) {
+            throw new IllegalArgumentException("Can't create a content type "
+                                                   + "without a default workflow.");
+        }
+
+        if (!section.getLifecycleDefinitions().contains(defaultLifecycle)) {
+            final KernelConfig kernelConfig = confManager.findConfiguration(
+                KernelConfig.class);
+            final Locale defaultLocale = kernelConfig.getDefaultLocale();
+            throw new IllegalArgumentException(String.format(
+                "The provided default lifecycle %d\"%s\" is not part of the"
+                    + "provided content section %d\"%s\".",
+                defaultLifecycle.getDefinitionId(),
+                defaultLifecycle.getLabel().getValue(defaultLocale),
+                section.getObjectId(),
+                section.getDisplayName()));
+        }
+
+        if (!section.getWorkflowTemplates().contains(defaultWorkflow)) {
+            final KernelConfig kernelConfig = confManager.findConfiguration(
+                KernelConfig.class);
+            final Locale defaultLocale = kernelConfig.getDefaultLocale();
+            throw new IllegalArgumentException(String.format(
+                "The provided default workflow %d\"%s\" is not part of the"
+                    + "provided content section %d\"%s\".",
+                defaultWorkflow.getWorkflowId(),
+                defaultWorkflow.getName().getValue(defaultLocale),
+                section.getObjectId(),
+                section.getDisplayName()));
+        }
+        
+        if (hasContentType(type, section)) {
+            return typeRepo.findByContentSectionAndClass(section, type).get();
+        }
+
+        final ContentType contentType = new ContentType();
+        contentType.setUuid(UUID.randomUUID().toString());
+        contentType.setContentSection(section);
+        contentType.setDisplayName(type.getName());
+        contentType.setContentItemClass(type.getName());
+        contentType.setDefaultLifecycle(defaultLifecycle);
+        contentType.setDefaultWorkflow(defaultWorkflow);
+
+        section.addContentType(contentType);
+
+        sectionRepo.save(section);
+        typeRepo.save(contentType);
+
+        return contentType;
     }
 
     /**
@@ -487,12 +540,25 @@ public class ContentSectionManager {
     public boolean hasContentType(final Class<? extends ContentItem> type,
                                   final ContentSection section) {
 
-        throw new UnsupportedOperationException();
+        if (type == null) {
+            return false;
+        }
+
+        if (section == null) {
+            return false;
+        }
+
+        final Optional<ContentType> result = typeRepo
+            .findByContentSectionAndClass(section, type);
+
+        return result.isPresent();
     }
 
     /**
      * Removes an <em>unused</em> {@link ContentType} from a
-     * {@link ContentSection}.
+     * {@link ContentSection}. This operation requires
+     * {@link CmsConstants#PRIVILEGE_ADMINISTER_CONTENT_TYPES} for the provided
+     * content section.
      *
      * @param type    The type to remove from the section.
      * @param section The section from which the type is removed.
@@ -500,13 +566,43 @@ public class ContentSectionManager {
      * @throws IllegalArgumentException if the provided {@link ContentType} is
      *                                  in use or the parameters or otherwise
      *                                  illegal.
-     * @see ContentTypeRepository#delete(org.librecms.contentsection.ContentType) 
+     * @see
+     * ContentTypeRepository#delete(org.librecms.contentsection.ContentType)
      */
+    @AuthorizationRequired
+    @Transactional(Transactional.TxType.REQUIRED)
     public void removeContentTypeFromSection(
         final Class<? extends ContentItem> type,
+        @RequiresPrivilege(CmsConstants.PRIVILEGE_ADMINISTER_CONTENT_TYPES)
         final ContentSection section) {
 
-        throw new UnsupportedOperationException();
+        if (type == null) {
+            throw new IllegalArgumentException("Can't remove content type null.");
+        }
+
+        if (section == null) {
+            throw new IllegalArgumentException("Can't remove a content type "
+                                                   + "from section null.");
+        }
+
+        final Optional<ContentType> contentType = typeRepo
+            .findByContentSectionAndClass(section, type);
+
+        if (!contentType.isPresent()) {
+            return;
+        }
+
+        if (typeRepo.isContentTypeInUse(contentType.get())) {
+            throw new IllegalArgumentException(String.format(
+                "ContentType %d:\"%s\" is used by content section %d:\"s\" can can't"
+                + "be deleted.",
+                contentType.get().getObjectId(),
+                contentType.get().getDisplayName(),
+                section.getObjectId(),
+                section.getDisplayName()));
+        }
+
+        typeRepo.delete(contentType.get());
     }
 
 }

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

@@ -56,6 +56,13 @@ import static org.librecms.CmsConstants.*;
 import static org.libreccm.testutils.DependenciesHelpers.*;
 
 import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.libreccm.workflow.WorkflowTemplate;
+import org.libreccm.workflow.WorkflowTemplateRepository;
+import org.librecms.contenttypes.Article;
+import org.librecms.contenttypes.Event;
+import org.librecms.contenttypes.News;
+import org.librecms.lifecycle.LifecycleDefinition;
+import org.librecms.lifecycle.LifecycleDefinitionRepository;
 
 /**
  * Tests for the {@link ContentSectionManager}.
@@ -87,6 +94,12 @@ public class ContentSectionManagerTest {
     @Inject
     private ContentTypeRepository typeRepo;
 
+    @Inject
+    private LifecycleDefinitionRepository lifecycleDefRepo;
+
+    @Inject
+    private WorkflowTemplateRepository workflowTemplateRepo;
+
     public ContentSectionManagerTest() {
     }
 
@@ -153,6 +166,7 @@ public class ContentSectionManagerTest {
                 .getPackage())
             .addPackage(org.librecms.lifecycle.Lifecycle.class.getPackage())
             .addPackage(ContentSection.class.getPackage())
+            .addPackage(org.librecms.contenttypes.Article.class.getPackage())
             .addPackage(org.libreccm.tests.categories.IntegrationTest.class
                 .getPackage())
             //.addAsLibraries(getModuleDependencies())
@@ -175,6 +189,8 @@ public class ContentSectionManagerTest {
         assertThat(confManager, is(not(nullValue())));
         assertThat(categoryRepo, is(not(nullValue())));
         assertThat(typeRepo, is(not(nullValue())));
+        assertThat(lifecycleDefRepo, is(not(nullValue())));
+        assertThat(workflowTemplateRepo, is(not(nullValue())));
     }
 
     /**
@@ -196,7 +212,9 @@ public class ContentSectionManagerTest {
                           "uuid",
                           "created",
                           "section_id",
-                          "creation_date"})
+                          "creation_date",
+                          "content_section_id",
+                          "folder_id"})
     @InSequence(100)
     public void createSection() {
         manager.createContentSection("test");
@@ -401,10 +419,25 @@ public class ContentSectionManagerTest {
                       + "ContentSectionManagerTest/data.xml")
     @ShouldMatchDataSet(
         value = "datasets/org/librecms/contentsection/"
-                    + "ContentSectionManagerTest/after-add-contenttype.xml")
+                    + "ContentSectionManagerTest/after-add-contenttype.xml",
+        excludeColumns = {"object_id",
+                          "uuid"})
     @InSequence(400)
     public void addContentTypeToSection() {
-        fail();
+        final ContentSection section = repository.findById(-1100L);
+        final LifecycleDefinition lifecycleDef = lifecycleDefRepo
+            .findById(-13002L);
+        final WorkflowTemplate workflowTemplate = workflowTemplateRepo
+            .findById(-14001L);
+
+        assertThat(section, is(not(nullValue())));
+        assertThat(lifecycleDef, is(not(nullValue())));
+        assertThat(workflowTemplate, is(not(nullValue())));
+
+        manager.addContentTypeToSection(Event.class,
+                                        section,
+                                        lifecycleDef,
+                                        workflowTemplate);
     }
 
     /**
@@ -419,8 +452,21 @@ public class ContentSectionManagerTest {
     @ShouldMatchDataSet("datasets/org/librecms/contentsection/"
                             + "ContentSectionManagerTest/data.xml")
     @InSequence(500)
-    public void addAlreadyAddedTypeToSection() {
+    public void addAlreadyAddedContentTypeToSection() {
-        fail();
+        final ContentSection section = repository.findById(-1100L);
+        final LifecycleDefinition lifecycleDef = lifecycleDefRepo
+            .findById(-13002L);
+        final WorkflowTemplate workflowTemplate = workflowTemplateRepo
+            .findById(-14002L);
+
+        assertThat(section, is(not(nullValue())));
+        assertThat(lifecycleDef, is(not(nullValue())));
+        assertThat(workflowTemplate, is(not(nullValue())));
+
+        manager.addContentTypeToSection(News.class,
+                                        section,
+                                        lifecycleDef,
+                                        workflowTemplate);
     }
 
     /**
@@ -436,8 +482,22 @@ public class ContentSectionManagerTest {
                             + "ContentSectionManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     @InSequence(600)
-    public void addTypeToSectionTypeIsNull() {
+    public void addContentTypeToSectionTypeIsNull() {
-        fail();
+        final ContentSection section = repository.findById(-1100L);
+        final LifecycleDefinition lifecycleDef = lifecycleDefRepo
+            .findById(-13002L);
+        final WorkflowTemplate workflowTemplate = workflowTemplateRepo
+            .findById(-14002L);
+
+        assertThat(section, is(not(nullValue())));
+        assertThat(lifecycleDef, is(not(nullValue())));
+        assertThat(workflowTemplate, is(not(nullValue())));
+
+        manager.addContentTypeToSection(null,
+                                        section,
+                                        lifecycleDef,
+                                        workflowTemplate);
+
     }
 
     /**
@@ -453,8 +513,19 @@ public class ContentSectionManagerTest {
                             + "ContentSectionManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     @InSequence(700)
-    public void addTypeToSectionSectionIsNull() {
+    public void addContentTypeToSectionSectionIsNull() {
-        fail();
+        final LifecycleDefinition lifecycleDef = lifecycleDefRepo
+            .findById(-13002L);
+        final WorkflowTemplate workflowTemplate = workflowTemplateRepo
+            .findById(-14002L);
+
+        assertThat(lifecycleDef, is(not(nullValue())));
+        assertThat(workflowTemplate, is(not(nullValue())));
+
+        manager.addContentTypeToSection(Event.class,
+                                        null,
+                                        lifecycleDef,
+                                        workflowTemplate);
     }
 
     /**
@@ -470,8 +541,18 @@ public class ContentSectionManagerTest {
                             + "ContentSectionManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     @InSequence(800)
-    public void addTypeToSectionLifecycleIsNull() {
+    public void addContentTypeToSectionLifecycleIsNull() {
-        fail();
+        final ContentSection section = repository.findById(-1100L);
+        final WorkflowTemplate workflowTemplate = workflowTemplateRepo
+            .findById(-14001L);
+
+        assertThat(section, is(not(nullValue())));
+        assertThat(workflowTemplate, is(not(nullValue())));
+
+        manager.addContentTypeToSection(Event.class,
+                                        section,
+                                        null,
+                                        workflowTemplate);
     }
 
     /**
@@ -487,8 +568,19 @@ public class ContentSectionManagerTest {
                             + "ContentSectionManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     @InSequence(900)
-    public void addTypeToSectionWorkflowIsNull() {
+    public void addContentTypeToSectionWorkflowIsNull() {
-        fail();
+        final ContentSection section = repository.findById(-1100L);
+        final LifecycleDefinition lifecycleDef = lifecycleDefRepo
+            .findById(-13002L);
+
+        assertThat(section, is(not(nullValue())));
+        assertThat(lifecycleDef, is(not(nullValue())));
+
+        manager.addContentTypeToSection(Event.class,
+                                        section,
+                                        lifecycleDef,
+                                        null);
+
     }
 
     /**
@@ -504,8 +596,21 @@ public class ContentSectionManagerTest {
                             + "ContentSectionManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     @InSequence(1000)
-    public void addTypeToSectionLifecycleNotInSection() {
+    public void addContentTypeToSectionLifecycleNotInSection() {
-        fail();
+        final ContentSection section = repository.findById(-1100L);
+        final LifecycleDefinition lifecycleDef = lifecycleDefRepo
+            .findById(-13003L);
+        final WorkflowTemplate workflowTemplate = workflowTemplateRepo
+            .findById(-14001L);
+
+        assertThat(section, is(not(nullValue())));
+        assertThat(lifecycleDef, is(not(nullValue())));
+        assertThat(workflowTemplate, is(not(nullValue())));
+
+        manager.addContentTypeToSection(Event.class,
+                                        section,
+                                        lifecycleDef,
+                                        workflowTemplate);
     }
 
     /**
@@ -521,8 +626,21 @@ public class ContentSectionManagerTest {
                             + "ContentSectionManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     @InSequence(1100)
-    public void addTypeToSectionWorkflowNoInSection() {
+    public void addContentTypeToSectionWorkflowNoInSection() {
-        fail();
+        final ContentSection section = repository.findById(-1100L);
+        final LifecycleDefinition lifecycleDef = lifecycleDefRepo
+            .findById(-13002L);
+        final WorkflowTemplate workflowTemplate = workflowTemplateRepo
+            .findById(-14003L);
+
+        assertThat(section, is(not(nullValue())));
+        assertThat(lifecycleDef, is(not(nullValue())));
+        assertThat(workflowTemplate, is(not(nullValue())));
+
+        manager.addContentTypeToSection(Event.class,
+                                        section,
+                                        lifecycleDef,
+                                        workflowTemplate);
     }
 
     /**
@@ -532,12 +650,13 @@ public class ContentSectionManagerTest {
     @Test
     @UsingDataSet("datasets/org/librecms/contentsection/"
                       + "ContentSectionManagerTest/data.xml")
-    @ShouldMatchDataSet(
-        value = "datasets/org/librecms/contentsection/"
-                    + "ContentSectionManagerTest/after-add-contenttype.xml")
     @InSequence(1200)
     public void verifyHasContentType() {
-        fail();
+        final ContentSection section = repository.findById(-1100L);
+
+        assertThat(manager.hasContentType(Article.class, section), is(true));
+        assertThat(manager.hasContentType(News.class, section), is(true));
+        assertThat(manager.hasContentType(Event.class, section), is(false));
     }
 
     /**
@@ -551,7 +670,9 @@ public class ContentSectionManagerTest {
                     + "ContentSectionManagerTest/after-remove-contenttype.xml")
     @InSequence(1300)
     public void removeContentTypeFromSection() {
-        fail();
+        final ContentSection section = repository.findById(-1100L);
+
+        manager.removeContentTypeFromSection(News.class, section);
     }
 
     /**
@@ -568,7 +689,9 @@ public class ContentSectionManagerTest {
                     + "ContentSectionManagerTest/data.xml")
     @InSequence(1301)
     public void removeNotExistingContentTypeFromSection() {
-        fail();
+        final ContentSection section = repository.findById(-1100L);
+
+        manager.removeContentTypeFromSection(Event.class, section);
     }
 
     /**
@@ -586,7 +709,9 @@ public class ContentSectionManagerTest {
     @ShouldThrowException(IllegalArgumentException.class)
     @InSequence(1400)
     public void removeContentTypeFromSectionTypeInUse() {
-        fail();
+        final ContentSection section = repository.findById(-1100L);
+
+        manager.removeContentTypeFromSection(Article.class, section);
     }
 
     /**
@@ -604,7 +729,9 @@ public class ContentSectionManagerTest {
     @ShouldThrowException(IllegalArgumentException.class)
     @InSequence(1400)
     public void removeContentTypeFromSectionTypeIsNull() {
-        fail();
+        final ContentSection section = repository.findById(-1100L);
+
+        manager.removeContentTypeFromSection(null, section);
     }
 
     /**
@@ -622,7 +749,7 @@ public class ContentSectionManagerTest {
     @ShouldThrowException(IllegalArgumentException.class)
     @InSequence(1400)
     public void removeContentTypeFromSectionSectionIsNull() {
-        fail();
+        manager.removeContentTypeFromSection(News.class, null);
     }
 
 }

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

@@ -44,6 +44,8 @@ public class DatasetsTest extends DatasetsVerifier {
     public static Collection<String> data() {
         return Arrays.asList(new String[]{
             "/datasets/org/librecms/contentsection/ContentSectionManagerTest/data.xml",
+            "/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-contenttype.xml",
+            "/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-contenttype.xml",
             "/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-role.xml",
             "/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-create.xml",
             "/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-role.xml",
@@ -70,9 +72,7 @@ public class DatasetsTest extends DatasetsVerifier {
             "/datasets/org/librecms/contentsection/FolderManagerTest/after-create-assets-folder.xml",
             "/datasets/org/librecms/contentsection/FolderManagerTest/after-delete-folder.xml",
             "/datasets/org/librecms/contentsection/FolderManagerTest/after-move-folder.xml",
-            "/datasets/org/librecms/contentsection/FolderManagerTest/after-move-folder-same-name.xml",
+            "/datasets/org/librecms/contentsection/FolderManagerTest/after-move-folder-same-name.xml",});
-
-        });
     }
 
     public DatasetsTest(final String datasetPath) {

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

@@ -0,0 +1,423 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+    
+    <!--
+    
+    Content Section info,
+    CcmApplication
+    Resource
+    CcmObject
+    
+    Root document folder category
+    
+    Root assets folder category
+    
+    Rollen:
+    
+    info_alert_recipient
+    
+    info_author: categorize_items, create_new_items, edit_items, 
+                 view_published_items, preview_items
+    
+    info_editor: categorize_items, create_new_items,, edit_items, approve_items, 
+                 delete_itemss, view_published_items, preview_items
+                     
+    info_manager: administer_roles, administer_workflow, administer_lifecyles, 
+                  administer_categories, administer_content_types, 
+                  categorize_items, create_new_items, edit_items, 
+                  approve_items, publish_items, delete-items, 
+                  view_published_items, preview_items
+    
+    info_publisher: categorize_items, create_new_items, edit_items,
+                    approve_items, publish_items, delete-items, 
+                    view_published_items, preview_items
+    
+    info_content_reader: view_published_items
+    
+    -->
+    
+    <ccm_core.ccm_revisions id="0" 
+                            timestamp="1451602800" />
+    
+    <ccm_core.ccm_objects object_id="-1100"
+                          display_name="info"
+                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
+    <ccm_core.ccm_objects object_id="-2100"
+                          display_name="info_root"
+                          uuid="82014239-9c06-486d-ae8c-4ae47f52a699" />
+    <ccm_core.ccm_objects object_id="-2200"
+                          display_name="info_assets"
+                          uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    <ccm_core.ccm_objects object_id="-10001"
+                          display_name="org.libreccm.contenttypes.Article"
+                          uuid="2c8ec2fb-319d-4d44-9698-697c08b2b941" />
+    <ccm_core.ccm_objects object_id="-10002"
+                          display_name="org.librecms.contenttypes.News"
+                          uuid="47740f22-f89f-4ec3-90cf-d62859e53c7e" />
+    <ccm_core.ccm_objects object_id="-10003"
+                          display_name="org.librecms.contenttypes.Event"
+                          uuid="e9d7b906-8297-47d7-be46-e1f040811765" />
+    <ccm_core.ccm_objects object_id="-11001"
+                          display_name="article1"
+                          uuid="aed4b402-1180-46c6-b42d-7245f4dca248" />
+
+    <ccm_core.ccm_objects_aud object_id="-11001"
+                              rev="0" 
+                              revtype="0" 
+                              display_name="article1" />
+    
+    <ccm_core.categories object_id="-2100"
+                         unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
+                         name="info_root" 
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-2200"
+                         unique_id="b163f73c-9ac2-44d7-a037-de621f5ca828"
+                         name="info_assets" 
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false" 
+                         category_order="1" />
+                             
+    <ccm_core.category_titles object_id="-2100" 
+                              locale="en" 
+                              localized_value="info_root" />
+    <ccm_core.category_titles object_id="-2200" 
+                              locale="en" 
+                              localized_value="info_assets" />
+    
+    <ccm_core.resources object_id="-1100" 
+                        created="2016-07-15" />
+    
+    <ccm_core.resource_titles object_id="-1100" 
+                              locale="en"
+                              localized_value="info" />
+    
+    <!--<ccm_core.resource_descriptions object_id="-1100" 
+    locale="en"
+    localized_value="Initial content section" />-->
+    
+    <ccm_core.applications object_id="-1100"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="info" />
+    
+    <ccm_core.workflows workflow_id="-14001" />
+    <ccm_core.workflows workflow_id="-14002" />
+    <ccm_core.workflows workflow_id="-14003" />
+
+    
+    <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"
+                     type="ASSETS_FOLDER" />
+    
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-13001" />
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-13002" />
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-13003" />
+
+    <ccm_cms.content_sections object_id="-1100"
+                              label="info"
+                              root_documents_folder_id="-2100"
+                              root_assets_folder_id="-2200" />
+    
+    <ccm_cms.content_types object_id="-10001" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-1100"
+                           default_lifecycle_id="-13001"
+                           default_workflow="-14001" />
+    <ccm_cms.content_types object_id="-10002" 
+                           content_item_class="org.librecms.contenttypes.News" 
+                           content_section_id="-1100"
+                           default_lifecycle_id="-13001"
+                           default_workflow="-14001" />
+    <ccm_cms.content_types object_id="-10003" 
+                           content_item_class="org.librecms.contenttypes.Event" 
+                           content_section_id="-1100" 
+                           default_lifecycle_id="-13002" 
+                           default_workflow="-14001" />
+
+    <ccm_cms.content_type_labels object_id="-10001"
+                                 locale="en" 
+                                 localized_value="Article" />
+    <ccm_cms.content_type_labels object_id="-10002"
+                                 locale="en" 
+                                 localized_value="News" />
+    <ccm_cms.content_section_lifecycle_definitions 
+        content_section_id="-1100"
+        lifecycle_definition_id="-13001" />
+    <ccm_cms.content_section_lifecycle_definitions 
+        content_section_id="-1100"
+        lifecycle_definition_id="-13002" />
+    
+    <ccm_cms.content_section_workflow_templates 
+        content_section_id="-1100"
+        workflow_template_id="-14001" />
+    <ccm_cms.content_section_workflow_templates 
+        content_section_id="-1100"
+        workflow_template_id="-14002" />
+
+    <ccm_cms.folder_content_section_map folder_id="-2100"
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2200"
+                                        content_section_id="-1100" />
+    
+    <ccm_cms.content_items object_id="-11001" 
+                           item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248"
+                           version="DRAFT"
+                           content_type_id="-10001" />
+
+    <ccm_cms.content_items_aud object_id="-11001" 
+                               rev="0"
+                               item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248" 
+                               version="DRAFT" 
+                               content_type_id="-10001" />
+ 
+    <ccm_cms.content_item_names object_id="-11001" 
+                                locale="en" 
+                                localized_value="article1" />
+    
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-11001"
+                                    localized_value="article1"
+                                    locale="en"
+                                    revtype="0" />
+
+    <ccm_cms.content_item_titles object_id="-11001" 
+                                 locale="en" 
+                                 localized_value="Article 1" />
+
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-11001"
+                                     localized_value="Article 1"
+                                     locale="en"
+                                     revtype="0" />
+
+    <ccm_cms.articles object_id="-11001" />
+    
+    <ccm_cms.articles_aud object_id="-11001" 
+                          rev="0" />
+    
+    <ccm_cms.article_texts 
+        object_id="-11001"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-11001" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
+        locale="en" 
+        revtype="0" />
+        
+    <ccm_core.categorizations categorization_id="-12001" 
+                              category_id="-2100" 
+                              object_id="-11001" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+
+    <ccm_core.ccm_roles role_id="-3100"
+                        name="info_alert_recipient" />
+    <ccm_core.ccm_roles role_id="-3200"
+                        name="info_author" />
+    <ccm_core.ccm_roles role_id="-3300"
+                        name="info_editor" />
+    <ccm_core.ccm_roles role_id="-3400"
+                        name="info_manager" />
+    <ccm_core.ccm_roles role_id="-3500"
+                        name="info_publisher" />
+    <ccm_core.ccm_roles role_id="-3600"
+                        name="info_content_reader" />
+    
+    <ccm_cms.content_section_roles role_id="-3100" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3200" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3300" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3400" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3500" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3600" 
+                                   section_id="-1100" />
+    
+    <ccm_core.permissions permission_id="-4110" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4120" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4130" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4140" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4150" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4210" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4220" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4230" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4240" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4250" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4260" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4270" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4310" 
+                          granted_privilege="administer_roles" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4320" 
+                          granted_privilege="administer_workflow" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4330" 
+                          granted_privilege="administer_lifecyles" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4340" 
+                          granted_privilege="administer_categories" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4350" 
+                          granted_privilege="administer_content_types" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4360" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4370" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4380" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4390" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4400" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4410" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4420" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4430" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4510" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4520" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4530" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4540" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4550" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4560" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4570" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4580" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4610" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"/>
+    
+</dataset>

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

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <dataset>
     
+    <ccm_core.ccm_revisions id="0" 
+                            timestamp="1451602800" />
+    
     <ccm_core.ccm_objects object_id="-1100"
                           display_name="info"
                           uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
@@ -10,6 +13,20 @@
     <ccm_core.ccm_objects object_id="-2200"
                           display_name="info_assets"
                           uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    <ccm_core.ccm_objects object_id="-10001"
+                          display_name="org.libreccm.contenttypes.Article"
+                          uuid="2c8ec2fb-319d-4d44-9698-697c08b2b941" />
+    <ccm_core.ccm_objects object_id="-10002"
+                          display_name="org.librecms.contenttypes.News"
+                          uuid="47740f22-f89f-4ec3-90cf-d62859e53c7e" />
+    <ccm_core.ccm_objects object_id="-11001"
+                          display_name="article1"
+                          uuid="aed4b402-1180-46c6-b42d-7245f4dca248" />
+
+    <ccm_core.ccm_objects_aud object_id="-11001"
+                              rev="0" 
+                              revtype="0" 
+                              display_name="article1" />
     
     <ccm_core.categories object_id="-2100"
                          unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
@@ -35,6 +52,7 @@
     
     <ccm_core.resources object_id="-1100" 
                         created="2016-07-15" />
+    
     <ccm_core.resource_titles object_id="-1100" 
                               locale="en"
                               localized_value="info" />
@@ -47,21 +65,121 @@
                            application_type="org.librecms.contentsection.ContentSection"
                            primary_url="info" />
 
+    <ccm_core.workflows workflow_id="-14001" />
+    <ccm_core.workflows workflow_id="-14002" />
+    <ccm_core.workflows workflow_id="-14003" />
+    
+    <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"
                      type="ASSETS_FOLDER" />
 
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-13001" />
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-13002" />
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-13003" />
+
     <ccm_cms.content_sections object_id="-1100"
                               label="info"
                               root_documents_folder_id="-2100"
                               root_assets_folder_id="-2200" />
 
+    <ccm_cms.content_types object_id="-10001" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-1100"
+                           default_lifecycle_id="-13001"
+                           default_workflow="-14001" />
+    <ccm_cms.content_types object_id="-10002" 
+                           content_item_class="org.librecms.contenttypes.News" 
+                           content_section_id="-1100"
+                           default_lifecycle_id="-13001"
+                           default_workflow="-14001" />
+
+    <ccm_cms.content_type_labels object_id="-10001"
+                                 locale="en" 
+                                 localized_value="Article" />
+    <ccm_cms.content_type_labels object_id="-10002"
+                                 locale="en" 
+                                 localized_value="News" />
+
+    <ccm_cms.content_section_lifecycle_definitions 
+        content_section_id="-1100"
+        lifecycle_definition_id="-13001" />
+    <ccm_cms.content_section_lifecycle_definitions 
+        content_section_id="-1100"
+        lifecycle_definition_id="-13002" />
+    
+    <ccm_cms.content_section_workflow_templates 
+        content_section_id="-1100"
+        workflow_template_id="-14001" />
+    <ccm_cms.content_section_workflow_templates 
+        content_section_id="-1100"
+        workflow_template_id="-14002" />
+
     <ccm_cms.folder_content_section_map folder_id="-2100"
                                         content_section_id="-1100" />
     <ccm_cms.folder_content_section_map folder_id="-2200"
                                         content_section_id="-1100" />
 
+    <ccm_cms.content_items object_id="-11001" 
+                           item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248"
+                           version="DRAFT"
+                           content_type_id="-10001" />
+
+    <ccm_cms.content_items_aud object_id="-11001" 
+                               rev="0"
+                               item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248" 
+                               version="DRAFT" 
+                               content_type_id="-10001" />
+ 
+    <ccm_cms.content_item_names object_id="-11001" 
+                                locale="en" 
+                                localized_value="article1" />
+    
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-11001"
+                                    localized_value="article1"
+                                    locale="en"
+                                    revtype="0" />
+
+    <ccm_cms.content_item_titles object_id="-11001" 
+                                 locale="en" 
+                                 localized_value="Article 1" />
+
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-11001"
+                                     localized_value="Article 1"
+                                     locale="en"
+                                     revtype="0" />
+
+    <ccm_cms.articles object_id="-11001" />
+    
+    <ccm_cms.articles_aud object_id="-11001" 
+                          rev="0" />
+    
+    <ccm_cms.article_texts 
+        object_id="-11001"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-11001" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
+        locale="en" 
+        revtype="0" />
+        
+    <ccm_core.categorizations categorization_id="-12001" 
+                              category_id="-2100" 
+                              object_id="-11001" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+
     <ccm_core.ccm_roles role_id="-3100"
                         name="info_alert_recipient" />
     <ccm_core.ccm_roles role_id="-3200"

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

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <dataset>
     
+    <ccm_core.ccm_revisions id="0" 
+                            timestamp="1451602800" />
+    
     <ccm_core.ccm_objects object_id="-1100"
                           display_name="info"
                           uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
@@ -19,6 +22,20 @@
     <ccm_core.ccm_objects object_id="-2400"
                           display_name="test_assets"
                           uuid="b393da77-df18-4eef-aa58-1f11599d82d0" />
+    <ccm_core.ccm_objects object_id="-10001"
+                          display_name="org.libreccm.contenttypes.Article"
+                          uuid="2c8ec2fb-319d-4d44-9698-697c08b2b941" />
+    <ccm_core.ccm_objects object_id="-10002"
+                          display_name="org.librecms.contenttypes.News"
+                          uuid="47740f22-f89f-4ec3-90cf-d62859e53c7e" />
+    <ccm_core.ccm_objects object_id="-11001"
+                          display_name="article1"
+                          uuid="aed4b402-1180-46c6-b42d-7245f4dca248" />
+
+    <ccm_core.ccm_objects_aud object_id="-11001"
+                              rev="0" 
+                              revtype="0" 
+                              display_name="article1" />
     
     <ccm_core.categories object_id="-2100"
                          unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
@@ -88,6 +105,15 @@
                            application_type="org.librecms.contentsection.ContentSection"
                            primary_url="test" />
 
+    <ccm_core.workflows workflow_id="-14001" />
+    <ccm_core.workflows workflow_id="-14002" />
+    <ccm_core.workflows workflow_id="-14003" />
+
+
+    <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"
@@ -97,6 +123,10 @@
     <ccm_cms.folders object_id="-2400"
                      type="ASSETS_FOLDER" />
 
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-13001" />
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-13002" />
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-13003" />
+    
     <ccm_cms.content_sections object_id="-1100"
                               label="info"
                               root_documents_folder_id="-2100"
@@ -106,6 +136,38 @@
                               root_documents_folder_id="-2300"
                               root_assets_folder_id="-2400" />
 
+    <ccm_cms.content_types object_id="-10001" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-1100"
+                           default_lifecycle_id="-13001"
+                           default_workflow="-14001" />
+    <ccm_cms.content_types object_id="-10002" 
+                           content_item_class="org.librecms.contenttypes.News" 
+                           content_section_id="-1100"
+                           default_lifecycle_id="-13001"
+                           default_workflow="-14001" />
+
+    <ccm_cms.content_type_labels object_id="-10001"
+                                 locale="en" 
+                                 localized_value="Article" />
+    <ccm_cms.content_type_labels object_id="-10002"
+                                 locale="en" 
+                                 localized_value="News" />
+
+    <ccm_cms.content_section_lifecycle_definitions 
+        content_section_id="-1100"
+        lifecycle_definition_id="-13001" />
+    <ccm_cms.content_section_lifecycle_definitions 
+        content_section_id="-1100"
+        lifecycle_definition_id="-13002" />
+    
+    <ccm_cms.content_section_workflow_templates 
+        content_section_id="-1100"
+        workflow_template_id="-14001" />
+    <ccm_cms.content_section_workflow_templates 
+        content_section_id="-1100"
+        workflow_template_id="-14002" />
+    
     <ccm_cms.folder_content_section_map folder_id="-2100"
                                         content_section_id="-1100" />
     <ccm_cms.folder_content_section_map folder_id="-2200"
@@ -115,6 +177,62 @@
     <ccm_cms.folder_content_section_map folder_id="-2400"
                                         content_section_id="-1200" />
 
+    <ccm_cms.content_items object_id="-11001" 
+                           item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248"
+                           version="DRAFT"
+                           content_type_id="-10001" />
+
+    <ccm_cms.content_items_aud object_id="-11001" 
+                               rev="0"
+                               item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248" 
+                               version="DRAFT" 
+                               content_type_id="-10001" />
+ 
+    <ccm_cms.content_item_names object_id="-11001" 
+                                locale="en" 
+                                localized_value="article1" />
+    
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-11001"
+                                    localized_value="article1"
+                                    locale="en"
+                                    revtype="0" />
+
+    <ccm_cms.content_item_titles object_id="-11001" 
+                                 locale="en" 
+                                 localized_value="Article 1" />
+
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-11001"
+                                     localized_value="Article 1"
+                                     locale="en"
+                                     revtype="0" />
+
+    <ccm_cms.articles object_id="-11001" />
+    
+    <ccm_cms.articles_aud object_id="-11001" 
+                          rev="0" />
+    
+    <ccm_cms.article_texts 
+        object_id="-11001"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-11001" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
+        locale="en" 
+        revtype="0" />
+        
+    <ccm_core.categorizations categorization_id="-12001" 
+                              category_id="-2100" 
+                              object_id="-11001" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+
     <ccm_core.ccm_roles role_id="-3100"
                         name="info_alert_recipient" />
     <ccm_core.ccm_roles role_id="-3200"

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

@@ -0,0 +1,404 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+    
+    <!--
+    
+    Content Section info,
+    CcmApplication
+    Resource
+    CcmObject
+    
+    Root document folder category
+    
+    Root assets folder category
+    
+    Rollen:
+    
+    info_alert_recipient
+    
+    info_author: categorize_items, create_new_items, edit_items, 
+                 view_published_items, preview_items
+    
+    info_editor: categorize_items, create_new_items,, edit_items, approve_items, 
+                 delete_itemss, view_published_items, preview_items
+                     
+    info_manager: administer_roles, administer_workflow, administer_lifecyles, 
+                  administer_categories, administer_content_types, 
+                  categorize_items, create_new_items, edit_items, 
+                  approve_items, publish_items, delete-items, 
+                  view_published_items, preview_items
+    
+    info_publisher: categorize_items, create_new_items, edit_items,
+                    approve_items, publish_items, delete-items, 
+                    view_published_items, preview_items
+    
+    info_content_reader: view_published_items
+    
+    -->
+    
+    <ccm_core.ccm_revisions id="0" 
+                            timestamp="1451602800" />
+    
+    <ccm_core.ccm_objects object_id="-1100"
+                          display_name="info"
+                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
+    <ccm_core.ccm_objects object_id="-2100"
+                          display_name="info_root"
+                          uuid="82014239-9c06-486d-ae8c-4ae47f52a699" />
+    <ccm_core.ccm_objects object_id="-2200"
+                          display_name="info_assets"
+                          uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    <ccm_core.ccm_objects object_id="-10001"
+                          display_name="org.libreccm.contenttypes.Article"
+                          uuid="2c8ec2fb-319d-4d44-9698-697c08b2b941" />
+    <ccm_core.ccm_objects object_id="-11001"
+                          display_name="article1"
+                          uuid="aed4b402-1180-46c6-b42d-7245f4dca248" />
+
+    <ccm_core.ccm_objects_aud object_id="-11001"
+                              rev="0" 
+                              revtype="0" 
+                              display_name="article1" />
+    
+    <ccm_core.categories object_id="-2100"
+                         unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
+                         name="info_root" 
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-2200"
+                         unique_id="b163f73c-9ac2-44d7-a037-de621f5ca828"
+                         name="info_assets" 
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false" 
+                         category_order="1" />
+                             
+    <ccm_core.category_titles object_id="-2100" 
+                              locale="en" 
+                              localized_value="info_root" />
+    <ccm_core.category_titles object_id="-2200" 
+                              locale="en" 
+                              localized_value="info_assets" />
+    
+    <ccm_core.resources object_id="-1100" 
+                        created="2016-07-15" />
+    
+    <ccm_core.resource_titles object_id="-1100" 
+                              locale="en"
+                              localized_value="info" />
+    
+    <!--<ccm_core.resource_descriptions object_id="-1100" 
+    locale="en"
+    localized_value="Initial content section" />-->
+    
+    <ccm_core.applications object_id="-1100"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="info" />
+    
+    <ccm_core.workflows workflow_id="-14001" />
+    <ccm_core.workflows workflow_id="-14002" />
+    <ccm_core.workflows workflow_id="-14003" />
+
+    <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"
+                     type="ASSETS_FOLDER" />
+    
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-13001" />
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-13002" />
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-13003" />
+    
+    <ccm_cms.content_sections object_id="-1100"
+                              label="info"
+                              root_documents_folder_id="-2100"
+                              root_assets_folder_id="-2200" />
+    
+    <ccm_cms.content_types object_id="-10001" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-1100"
+                           default_lifecycle_id="-13001"
+                           default_workflow="-14001" />
+
+    <ccm_cms.content_type_labels object_id="-10001"
+                                 locale="en" 
+                                 localized_value="Article" />
+
+    <ccm_cms.content_section_lifecycle_definitions 
+        content_section_id="-1100"
+        lifecycle_definition_id="-13001" />
+    <ccm_cms.content_section_lifecycle_definitions 
+        content_section_id="-1100"
+        lifecycle_definition_id="-13002" />
+    
+    <ccm_cms.content_section_workflow_templates 
+        content_section_id="-1100"
+        workflow_template_id="-14001" />
+    <ccm_cms.content_section_workflow_templates 
+        content_section_id="-1100"
+        workflow_template_id="-14002" />
+        
+    <ccm_cms.folder_content_section_map folder_id="-2100"
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2200"
+                                        content_section_id="-1100" />
+    
+    <ccm_cms.content_items object_id="-11001" 
+                           item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248"
+                           version="DRAFT"
+                           content_type_id="-10001" />
+
+    <ccm_cms.content_items_aud object_id="-11001" 
+                               rev="0"
+                               item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248" 
+                               version="DRAFT" 
+                               content_type_id="-10001" />
+ 
+    <ccm_cms.content_item_names object_id="-11001" 
+                                locale="en" 
+                                localized_value="article1" />
+    
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-11001"
+                                    localized_value="article1"
+                                    locale="en"
+                                    revtype="0" />
+
+    <ccm_cms.content_item_titles object_id="-11001" 
+                                 locale="en" 
+                                 localized_value="Article 1" />
+
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-11001"
+                                     localized_value="Article 1"
+                                     locale="en"
+                                     revtype="0" />
+
+    <ccm_cms.articles object_id="-11001" />
+    
+    <ccm_cms.articles_aud object_id="-11001" 
+                          rev="0" />
+    
+    <ccm_cms.article_texts 
+        object_id="-11001"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-11001" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
+        locale="en" 
+        revtype="0" />
+        
+    <ccm_core.categorizations categorization_id="-12001" 
+                              category_id="-2100" 
+                              object_id="-11001" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+
+    <ccm_core.ccm_roles role_id="-3100"
+                        name="info_alert_recipient" />
+    <ccm_core.ccm_roles role_id="-3200"
+                        name="info_author" />
+    <ccm_core.ccm_roles role_id="-3300"
+                        name="info_editor" />
+    <ccm_core.ccm_roles role_id="-3400"
+                        name="info_manager" />
+    <ccm_core.ccm_roles role_id="-3500"
+                        name="info_publisher" />
+    <ccm_core.ccm_roles role_id="-3600"
+                        name="info_content_reader" />
+    
+    <ccm_cms.content_section_roles role_id="-3100" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3200" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3300" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3400" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3500" 
+                                   section_id="-1100" />
+    <ccm_cms.content_section_roles role_id="-3600" 
+                                   section_id="-1100" />
+    
+    <ccm_core.permissions permission_id="-4110" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4120" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4130" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4140" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4150" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3200" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4210" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4220" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4230" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4240" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4250" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4260" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4270" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3300" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4310" 
+                          granted_privilege="administer_roles" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4320" 
+                          granted_privilege="administer_workflow" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4330" 
+                          granted_privilege="administer_lifecyles" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4340" 
+                          granted_privilege="administer_categories" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4350" 
+                          granted_privilege="administer_content_types" 
+                          object_id="-1100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4360" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4370" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4380" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4390" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4400" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4410" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4420" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4430" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3400" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4510" 
+                          granted_privilege="categorize_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4520" 
+                          granted_privilege="create_new_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4530" 
+                          granted_privilege="edit_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4540" 
+                          granted_privilege="approve_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4550" 
+                          granted_privilege="publish_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4560" 
+                          granted_privilege="delete_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4570" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4580" 
+                          granted_privilege="preview_items" 
+                          object_id="-2100" 
+                          grantee_id="-3500" 
+                          creation_date="2016-07-15"/>
+    <ccm_core.permissions permission_id="-4610" 
+                          granted_privilege="view_published_items" 
+                          object_id="-2100" 
+                          grantee_id="-3600" 
+                          creation_date="2016-07-15"/>
+    
+</dataset>

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

@@ -36,6 +36,9 @@
     
     -->
     
+    <ccm_core.ccm_revisions id="0" 
+                            timestamp="1451602800" />
+    
     <ccm_core.ccm_objects object_id="-1100"
                           display_name="info"
                           uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
@@ -45,6 +48,20 @@
     <ccm_core.ccm_objects object_id="-2200"
                           display_name="info_assets"
                           uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    <ccm_core.ccm_objects object_id="-10001"
+                          display_name="org.libreccm.contenttypes.Article"
+                          uuid="2c8ec2fb-319d-4d44-9698-697c08b2b941" />
+    <ccm_core.ccm_objects object_id="-10002"
+                          display_name="org.librecms.contenttypes.News"
+                          uuid="47740f22-f89f-4ec3-90cf-d62859e53c7e" />
+    <ccm_core.ccm_objects object_id="-11001"
+                          display_name="article1"
+                          uuid="aed4b402-1180-46c6-b42d-7245f4dca248" />
+
+    <ccm_core.ccm_objects_aud object_id="-11001"
+                              rev="0" 
+                              revtype="0" 
+                              display_name="article1" />
 
     <ccm_core.categories object_id="-2100"
                          unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
@@ -70,6 +87,7 @@
     
     <ccm_core.resources object_id="-1100" 
                         created="2016-07-15" />
+    
     <ccm_core.resource_titles object_id="-1100" 
                               locale="en"
                               localized_value="info" />
@@ -82,21 +100,120 @@
                            application_type="org.librecms.contentsection.ContentSection"
                            primary_url="info" />
     
+    <ccm_core.workflows workflow_id="-14001" />
+    <ccm_core.workflows workflow_id="-14002" />
+    <ccm_core.workflows workflow_id="-14003" />
+
+    <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"
                      type="ASSETS_FOLDER" />
     
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-13001" />
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-13002" />
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-13003" />
+    
     <ccm_cms.content_sections object_id="-1100"
                               label="info"
                               root_documents_folder_id="-2100"
                               root_assets_folder_id="-2200" />
 
+    <ccm_cms.content_types object_id="-10001" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-1100"
+                           default_lifecycle_id="-13001"
+                           default_workflow="-14001" />
+    <ccm_cms.content_types object_id="-10002" 
+                           content_item_class="org.librecms.contenttypes.News" 
+                           content_section_id="-1100"
+                           default_lifecycle_id="-13001"
+                           default_workflow="-14001" />
+
+    <ccm_cms.content_type_labels object_id="-10001"
+                                 locale="en" 
+                                 localized_value="Article" />
+    <ccm_cms.content_type_labels object_id="-10002"
+                                 locale="en" 
+                                 localized_value="News" />
+    <ccm_cms.content_section_lifecycle_definitions 
+        content_section_id="-1100"
+        lifecycle_definition_id="-13001" />
+    <ccm_cms.content_section_lifecycle_definitions 
+        content_section_id="-1100"
+        lifecycle_definition_id="-13002" />
+    
+    <ccm_cms.content_section_workflow_templates 
+        content_section_id="-1100"
+        workflow_template_id="-14001" />
+    <ccm_cms.content_section_workflow_templates 
+        content_section_id="-1100"
+        workflow_template_id="-14002" />
+    
     <ccm_cms.folder_content_section_map folder_id="-2100"
                                         content_section_id="-1100" />
     <ccm_cms.folder_content_section_map folder_id="-2200"
                                         content_section_id="-1100" />
     
+    <ccm_cms.content_items object_id="-11001" 
+                           item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248"
+                           version="DRAFT"
+                           content_type_id="-10001" />
+
+    <ccm_cms.content_items_aud object_id="-11001" 
+                               rev="0"
+                               item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248" 
+                               version="DRAFT" 
+                               content_type_id="-10001" />
+ 
+    <ccm_cms.content_item_names object_id="-11001" 
+                                locale="en" 
+                                localized_value="article1" />
+    
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-11001"
+                                    localized_value="article1"
+                                    locale="en"
+                                    revtype="0" />
+
+    <ccm_cms.content_item_titles object_id="-11001" 
+                                 locale="en" 
+                                 localized_value="Article 1" />
+
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-11001"
+                                     localized_value="Article 1"
+                                     locale="en"
+                                     revtype="0" />
+
+    <ccm_cms.articles object_id="-11001" />
+    
+    <ccm_cms.articles_aud object_id="-11001" 
+                          rev="0" />
+    
+    <ccm_cms.article_texts 
+        object_id="-11001"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-11001" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
+        locale="en" 
+        revtype="0" />
+        
+    <ccm_core.categorizations categorization_id="-12001" 
+                              category_id="-2100" 
+                              object_id="-11001" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+
     <ccm_core.ccm_roles role_id="-3100"
                         name="info_alert_recipient" />
     <ccm_core.ccm_roles role_id="-3200"

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

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <dataset>
     
+    <ccm_core.ccm_revisions id="0" 
+                            timestamp="1451602800" />
+
     <ccm_core.ccm_objects object_id="-1100"
                           display_name="content"
                           uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
@@ -10,6 +13,21 @@
     <ccm_core.ccm_objects object_id="-2200"
                           display_name="content_assets"
                           uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    <ccm_core.ccm_objects object_id="-10001"
+                          display_name="org.libreccm.contenttypes.Article"
+                          uuid="2c8ec2fb-319d-4d44-9698-697c08b2b941" />
+    <ccm_core.ccm_objects object_id="-10002"
+                          display_name="org.librecms.contenttypes.News"
+                          uuid="47740f22-f89f-4ec3-90cf-d62859e53c7e" />
+    <ccm_core.ccm_objects object_id="-11001"
+                          display_name="article1"
+                          uuid="aed4b402-1180-46c6-b42d-7245f4dca248" />
+
+        
+    <ccm_core.ccm_objects_aud object_id="-11001"
+                              rev="0" 
+                              revtype="0" 
+                              display_name="article1" />
 
     <ccm_core.categories object_id="-2100"
                          unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
@@ -35,6 +53,7 @@
     
     <ccm_core.resources object_id="-1100" 
                         created="2016-07-15" />
+    
     <ccm_core.resource_titles object_id="-1100" 
                               locale="en"
                               localized_value="content" />
@@ -47,21 +66,121 @@
                            application_type="org.librecms.contentsection.ContentSection"
                            primary_url="content" />
 
+    <ccm_core.workflows workflow_id="-14001" />
+    <ccm_core.workflows workflow_id="-14002" />
+    <ccm_core.workflows workflow_id="-14003" />
+
+    <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"
                      type="ASSETS_FOLDER" />
 
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-13001" />
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-13002" />
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-13003" />
+    
     <ccm_cms.content_sections object_id="-1100"
                               label="content"
                               root_documents_folder_id="-2100"
                               root_assets_folder_id="-2200" />
     
+    <ccm_cms.content_types object_id="-10001" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-1100"
+                           default_lifecycle_id="-13001"
+                           default_workflow="-14001" />
+    <ccm_cms.content_types object_id="-10002" 
+                           content_item_class="org.librecms.contenttypes.News" 
+                           content_section_id="-1100"
+                           default_lifecycle_id="-13001"
+                           default_workflow="-14001" />
+
+    <ccm_cms.content_type_labels object_id="-10001"
+                                 locale="en" 
+                                 localized_value="Article" />
+    <ccm_cms.content_type_labels object_id="-10002"
+                                 locale="en" 
+                                 localized_value="News" />
+
+    <ccm_cms.content_section_lifecycle_definitions 
+        content_section_id="-1100"
+        lifecycle_definition_id="-13001" />
+    <ccm_cms.content_section_lifecycle_definitions 
+        content_section_id="-1100"
+        lifecycle_definition_id="-13002" />
+    
+    <ccm_cms.content_section_workflow_templates 
+        content_section_id="-1100"
+        workflow_template_id="-14001" />
+    <ccm_cms.content_section_workflow_templates 
+        content_section_id="-1100"
+        workflow_template_id="-14002" />
+
     <ccm_cms.folder_content_section_map folder_id="-2100"
                                         content_section_id="-1100" />
     <ccm_cms.folder_content_section_map folder_id="-2200"
                                         content_section_id="-1100" />
 
+    <ccm_cms.content_items object_id="-11001" 
+                           item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248"
+                           version="DRAFT"
+                           content_type_id="-10001" />
+
+    <ccm_cms.content_items_aud object_id="-11001" 
+                               rev="0"
+                               item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248" 
+                               version="DRAFT" 
+                               content_type_id="-10001" />
+ 
+    <ccm_cms.content_item_names object_id="-11001" 
+                                locale="en" 
+                                localized_value="article1" />
+    
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-11001"
+                                    localized_value="article1"
+                                    locale="en"
+                                    revtype="0" />
+
+    <ccm_cms.content_item_titles object_id="-11001" 
+                                 locale="en" 
+                                 localized_value="Article 1" />
+
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-11001"
+                                     localized_value="Article 1"
+                                     locale="en"
+                                     revtype="0" />
+
+    <ccm_cms.articles object_id="-11001" />
+    
+    <ccm_cms.articles_aud object_id="-11001" 
+                          rev="0" />
+    
+    <ccm_cms.article_texts 
+        object_id="-11001"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-11001" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
+        locale="en" 
+        revtype="0" />
+        
+    <ccm_core.categorizations categorization_id="-12001" 
+                              category_id="-2100" 
+                              object_id="-11001" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+
     <ccm_core.ccm_roles role_id="-3100"
                         name="content_alert_recipient" />
     <ccm_core.ccm_roles role_id="-3200"

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

@@ -36,6 +36,9 @@
     
     -->
     
+    <ccm_core.ccm_revisions id="0" 
+                            timestamp="1451602800" />
+    
     <ccm_core.ccm_objects object_id="-1100"
                           display_name="info"
                           uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
@@ -45,6 +48,20 @@
     <ccm_core.ccm_objects object_id="-2200"
                           display_name="info_assets"
                           uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    <ccm_core.ccm_objects object_id="-10001"
+                          display_name="org.libreccm.contenttypes.Article"
+                          uuid="2c8ec2fb-319d-4d44-9698-697c08b2b941" />
+    <ccm_core.ccm_objects object_id="-10002"
+                          display_name="org.librecms.contenttypes.News"
+                          uuid="47740f22-f89f-4ec3-90cf-d62859e53c7e" />
+    <ccm_core.ccm_objects object_id="-11001"
+                          display_name="article1"
+                          uuid="aed4b402-1180-46c6-b42d-7245f4dca248" />
+
+    <ccm_core.ccm_objects_aud object_id="-11001"
+                              rev="0" 
+                              revtype="0" 
+                              display_name="article1" />
     
     <ccm_core.categories object_id="-2100"
                          unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
@@ -70,6 +87,7 @@
     
     <ccm_core.resources object_id="-1100" 
                         created="2016-07-15" />
+    
     <ccm_core.resource_titles object_id="-1100" 
                               locale="en"
                               localized_value="info" />
@@ -82,21 +100,121 @@
                            application_type="org.librecms.contentsection.ContentSection"
                            primary_url="info" />
     
+    <ccm_core.workflows workflow_id="-14001" />
+    <ccm_core.workflows workflow_id="-14002" />
+    <ccm_core.workflows workflow_id="-14003" />
+
+    <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"
                      type="ASSETS_FOLDER" />
     
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-13001" />
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-13002" />
+    <ccm_cms.lifecyle_definitions lifecycle_definition_id="-13003" />
+    
     <ccm_cms.content_sections object_id="-1100"
                               label="info"
                               root_documents_folder_id="-2100"
                               root_assets_folder_id="-2200" />
     
+    <ccm_cms.content_types object_id="-10001" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-1100"
+                           default_lifecycle_id="-13001"
+                           default_workflow="-14001" />
+    <ccm_cms.content_types object_id="-10002" 
+                           content_item_class="org.librecms.contenttypes.News" 
+                           content_section_id="-1100"
+                           default_lifecycle_id="-13001"
+                           default_workflow="-14001" />
+
+    <ccm_cms.content_type_labels object_id="-10001"
+                                 locale="en" 
+                                 localized_value="Article" />
+    <ccm_cms.content_type_labels object_id="-10002"
+                                 locale="en" 
+                                 localized_value="News" />
+
+    <ccm_cms.content_section_lifecycle_definitions 
+        content_section_id="-1100"
+        lifecycle_definition_id="-13001" />
+    <ccm_cms.content_section_lifecycle_definitions 
+        content_section_id="-1100"
+        lifecycle_definition_id="-13002" />
+    
+    <ccm_cms.content_section_workflow_templates 
+        content_section_id="-1100"
+        workflow_template_id="-14001" />
+    <ccm_cms.content_section_workflow_templates 
+        content_section_id="-1100"
+        workflow_template_id="-14002" />
+        
     <ccm_cms.folder_content_section_map folder_id="-2100"
                                         content_section_id="-1100" />
     <ccm_cms.folder_content_section_map folder_id="-2200"
                                         content_section_id="-1100" />
     
+    <ccm_cms.content_items object_id="-11001" 
+                           item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248"
+                           version="DRAFT"
+                           content_type_id="-10001" />
+
+    <ccm_cms.content_items_aud object_id="-11001" 
+                               rev="0"
+                               item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248" 
+                               version="DRAFT" 
+                               content_type_id="-10001" />
+ 
+    <ccm_cms.content_item_names object_id="-11001" 
+                                locale="en" 
+                                localized_value="article1" />
+    
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-11001"
+                                    localized_value="article1"
+                                    locale="en"
+                                    revtype="0" />
+
+    <ccm_cms.content_item_titles object_id="-11001" 
+                                 locale="en" 
+                                 localized_value="Article 1" />
+
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-11001"
+                                     localized_value="Article 1"
+                                     locale="en"
+                                     revtype="0" />
+
+    <ccm_cms.articles object_id="-11001" />
+    
+    <ccm_cms.articles_aud object_id="-11001" 
+                          rev="0" />
+    
+    <ccm_cms.article_texts 
+        object_id="-11001"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-11001" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
+        locale="en" 
+        revtype="0" />
+        
+    <ccm_core.categorizations categorization_id="-12001" 
+                              category_id="-2100" 
+                              object_id="-11001" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+
     <ccm_core.ccm_roles role_id="-3100"
                         name="info_alert_recipient" />
     <ccm_core.ccm_roles role_id="-3200"

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

@@ -23,7 +23,6 @@
                           display_name="org.librecms.contenttypes.News"
                           uuid="47740f22-f89f-4ec3-90cf-d62859e53c7e" />
         
-        
     <ccm_core.ccm_objects_aud object_id="-3001"
                               rev="0" 
                               revtype="0" 
@@ -31,6 +30,7 @@
     
     <ccm_core.resources object_id="-1001" 
                         created="2016-07-15" />
+    
     <ccm_core.resource_titles object_id="-1001" 
                               locale="en"
                               localized_value="info" />