CCM NG/ccm-cms: Tests for FolderManager (and fixes for bugs with by the tests), migration scripts for adding tables for folders

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

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

@@ -918,7 +918,7 @@ public class ContentItemManager {
      * {@code info:/research/computer-science/artificial-intelligence/neural-nets}.
      *
      * @param item               The item whose path is generated.
-     * @param withContentSection Wether to include the content section into the
+     * @param withContentSection Whether to include the content section into the
      *                           path.
      *
      * @return The path of the content item
@@ -940,7 +940,6 @@ public class ContentItemManager {
 
             Category current = result.get(0).getCategory();
             tokens.add(current.getName());
-
             while (current.getParentCategory() != null) {
                 current = current.getParentCategory();
                 tokens.add(current.getName());
@@ -953,7 +952,7 @@ public class ContentItemManager {
                 final String sectionName = item.getContentType().
                     getContentSection().getDisplayName();
                 return String.format(
-                    "%s/%s", sectionName, path);
+                    "%s:/%s", sectionName, path);
             } else {
                 return String.format("/%s", path);
             }

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

@@ -24,14 +24,16 @@ import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
 import org.libreccm.categorization.Category;
-import org.libreccm.core.CcmObject;
 
+import java.util.Collections;
+import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
+import java.util.stream.Collectors;
 
 import javax.persistence.Column;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import javax.persistence.JoinTable;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 
@@ -58,7 +60,12 @@ public class Folder extends Category {
     private static final long serialVersionUID = 1L;
 
     @OneToOne
-    @JoinColumn(name = "CONTENT_SECTION_ID")
+//    @JoinColumn(name = "CONTENT_SECTION_ID")
+    @JoinTable(name = "FOLDER_CONTENT_SECTION_MAP", schema = DB_SCHEMA,
+               inverseJoinColumns = {
+                   @JoinColumn(name = "CONTENT_SECTION_ID")},
+               joinColumns = {
+                   @JoinColumn(name = "FOLDER_ID")})
     private ContentSection section;
 
     @Column(name = "TYPE", nullable = false)
@@ -81,6 +88,29 @@ public class Folder extends Category {
         this.type = type;
     }
 
+    /**
+     * A convenient method for getting all sub folders of folder.
+     *
+     * @return The sub folders of this folder.
+     */
+    public List<Folder> getSubFolders() {
+        return Collections.unmodifiableList(
+            getSubCategories()
+            .stream()
+            .filter(subCategory -> subCategory instanceof Folder)
+            .map(subCategory -> (Folder) subCategory)
+            .collect(Collectors.toList()));
+    }
+
+    public Folder getParentFolder() {
+        final Category parent = getParentCategory();
+        if (parent == null) {
+            return null;
+        } else {
+            return (Folder) getParentCategory();
+        }
+    }
+
     @Override
     public int hashCode() {
         int hash = super.hashCode();

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

@@ -18,17 +18,250 @@
  */
 package org.librecms.contentsection;
 
+import com.arsdigita.kernel.KernelConfig;
+
+import org.libreccm.categorization.CategoryManager;
+import org.libreccm.configuration.ConfigurationManager;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.transaction.Transactional;
 
 /**
+ * Provides several methods for managing {@link Folder}s.
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RequestScoped
 public class FolderManager {
 
-    //createFolder
+    @Inject
-    //deleteFolder
+    private ConfigurationManager confManager;
-    //moveFolder
+
+    @Inject
+    private FolderRepository folderRepo;
+
+    @Inject
+    private CategoryManager categoryManager;
+
+    @Inject
+    private ContentItemManager itemManager;
+
+    /**
+     * Creates new folder as sub folder of the provided parent folder. The type
+     * and the content section to which the folder belongs are the same as for
+     * the provided parent folder.
+     *
+     * @param name   The name of the new folder.
+     * @param parent The folder in which the new folder is generated.
+     *
+     * @return The new folder.
+     */
+    @Transactional(Transactional.TxType.REQUIRED)
+    public Folder createFolder(final String name, final Folder parent) {
+        if (parent == null) {
+            throw new IllegalArgumentException(
+                "Can't create a folder without a parent folder.");
+        }
+
+        if (name == null || name.trim().isEmpty()) {
+            throw new IllegalArgumentException(
+                "Can't create a folder with an empty name");
+        }
+
+        final KernelConfig kernelConfig = confManager.findConfiguration(
+            KernelConfig.class);
+
+        final Folder folder = new Folder();
+        folder.setName(name);
+        folder.setDisplayName(name);
+        folder.getTitle().addValue(kernelConfig.getDefaultLocale(), name);
+        folder.setSection(parent.getSection());
+        folder.setType(parent.getType());
+        folderRepo.save(folder);
+
+        categoryManager.addSubCategoryToCategory(folder, parent);
+
+        return folder;
+    }
+
+    /**
+     * Deletes a empty, none-root folder.
+     *
+     * @param folder The folder to delete.
+     */
+    @Transactional(Transactional.TxType.REQUIRED)
+    public void deleteFolder(final Folder folder) {
+        if (folder == null) {
+            throw new IllegalArgumentException("Can't delete folder null");
+        }
+
+        if (!folder.getSubCategories().isEmpty()) {
+            throw new IllegalArgumentException(String.format(
+                "Can't delete folder \"%s\" because the folder is not empty",
+                getFolderPath(folder, true)));
+        }
+
+        if (!folder.getObjects().isEmpty()) {
+            throw new IllegalArgumentException(String.format(
+                "Can't delete folder \"%s\" because the folder is not empty.",
+                getFolderPath(folder)));
+        }
+
+        if (folder.getParentFolder() == null) {
+            throw new IllegalArgumentException(
+                "The folder to delete is a root folder can can't be deleted.");
+        }
+
+        folderRepo.delete(folder);
+    }
+
+    /**
+     * Moves a none-root folder to another folder. If there any live
+     * {@link ContentItem}s in the folder and its sub folder the folder can't be
+     * moved. Also the target folder must belong to the same
+     * {@link ContentSection} than the folder to move.
+     *
+     * @param folder The folder to move.
+     * @param target The target folder.
+     */
+    @Transactional(Transactional.TxType.REQUIRED)
+    public void moveFolder(final Folder folder, final Folder target) {
+        if (folder == null) {
+            throw new IllegalArgumentException("Can't move folder null");
+        }
+
+        if (target == null) {
+            throw new IllegalArgumentException(
+                "Can't move a folder to folder null");
+        }
+
+        if (folder.getParentFolder() == null) {
+            throw new IllegalArgumentException(String.format(
+                "The folder \"%s\" to move is a root folder can can't be moved.",
+                getFolderPath(folder)));
+        }
+
+        if (folder.equals(target)) {
+            throw new IllegalArgumentException(
+                "The folder to move and the target folder are the same folder.");
+        }
+
+        if (!folder.getSection().equals(target.getSection())) {
+            throw new IllegalArgumentException(String.format(
+                "Folders can't be moved between content section. The "
+                    + "folder \"%s\" to move belongs to section \"%s\", "
+                    + "the target folder \"%s\" belongs to section \"%s\".",
+                getFolderPath(folder),
+                folder.getSection().getDisplayName(),
+                getFolderPath(target),
+                target.getSection().getDisplayName()));
+        }
+
+        if (folder.getType() != target.getType()) {
+            throw new IllegalArgumentException("The folder to move is a \"%s\","
+                                                   + "but the target folder is a \"%s\" folder.");
+        }
+
+        if (liveItemsInFolder(folder)) {
+            throw new IllegalArgumentException(String.format(
+                "Can't move folder \"%s\" because some items in the folder or"
+                    + "its sub folder are live.",
+                getFolderPath(folder, true)));
+        }
+
+        final Folder source = folder.getParentFolder();
+        categoryManager.removeSubCategoryFromCategory(folder, source);
+        final boolean sameName = target.getSubCategories()
+            .stream()
+            .anyMatch(subCategory -> folder.getName().equals(subCategory
+                .getName()));
+        if (sameName) {
+            final String name = String.format("%s_1", folder.getName());
+            folder.setName(name);
+            folder.setDisplayName(name);
+
+            final KernelConfig kernelConfig = confManager.findConfiguration(
+                KernelConfig.class);
+            folder.getTitle().addValue(kernelConfig.getDefaultLocale(), name);
+        }
+        categoryManager.addSubCategoryToCategory(folder, target);
+    }
+
+    /**
+     * Internal helper method for checking if there any live items in a given
+     * folder or its sub folders.
+     *
+     * @param folder The folder to check for live items.
+     *
+     * @return {@code true} if there any live items in the folder or its sub
+     *         folders, {@code false} if not.
+     */
+    private boolean liveItemsInFolder(final Folder folder) {
+        final boolean liveItemsInFolder = folder.getObjects()
+            .stream()
+            .map(categorization -> categorization.getCategorizedObject())
+            .filter(object -> object instanceof ContentItem)
+            .map(object -> (ContentItem) object)
+            .anyMatch(item -> itemManager.isLive(item));
+
+        final boolean liveItemsInSubFolders = folder.getSubFolders()
+            .stream()
+            .anyMatch(subFolder -> liveItemsInFolder(subFolder));
+
+        return liveItemsInFolder || liveItemsInSubFolders;
+    }
+
+    /**
+     * Returns the path of folder.
+     *
+     * @param folder The folder.
+     *
+     * @return The path of the folder as a UNIX-like path, but without the
+     *         content section as prefix.
+     */
+    public String getFolderPath(final Folder folder) {
+        return getFolderPath(folder, false);
+    }
+
+    /**
+     * Returns the path of folder.
+     *
+     * @param folder             The folder.
+     * @param withContentSection Whether to include the content section in the
+     *                           path.
+     *
+     * @return The path of the folder as a UNIX-like path, optionally with the
+     *         content section the folder belongs to as prefix..
+     */
+    public String getFolderPath(final Folder folder,
+                                final boolean withContentSection) {
+        if (folder == null) {
+            throw new IllegalArgumentException("Can't generate a path for null.");
+        }
+        
+        final List<String> tokens = new ArrayList<>();
+
+        tokens.add(folder.getName());
+        Folder current = folder;
+        while (current.getParentFolder() != null) {
+            current = current.getParentFolder();
+            tokens.add(current.getName());
+        }
+
+        Collections.reverse(tokens);
+        final String path = String.join("/", tokens);
+
+        if (withContentSection) {
+            final String sectionName = folder.getSection().getDisplayName();
+            return String.format("%s:/%s/", sectionName, path);
+        } else {
+            return String.format("/%s/", path);
+        }
+    }
 
 }

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

@@ -75,7 +75,7 @@ public class FolderRepository extends AbstractEntityRepository<Long, Folder> {
     public List<Folder> getRootAssetFolders() {
         final TypedQuery<Folder> query = getEntityManager().createNamedQuery(
             "Folder.rootFolders", Folder.class);
-        query.setParameter("type", FolderType.ASSET_FOLDER);
+        query.setParameter("type", FolderType.ASSETS_FOLDER);
 
         return query.getResultList();
     }
@@ -143,7 +143,7 @@ public class FolderRepository extends AbstractEntityRepository<Long, Folder> {
         final String[] tokens = normalizedPath.split("/");
         Folder current;
         switch(type) {
-            case ASSET_FOLDER:
+            case ASSETS_FOLDER:
                 current = section.getRootAssetsFolder();
                 break;
             case DOCUMENTS_FOLDER:

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

@@ -25,6 +25,6 @@ package org.librecms.contentsection;
 public enum FolderType {
     
     DOCUMENTS_FOLDER,
-    ASSET_FOLDER,
+    ASSETS_FOLDER,
     
 }

ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_7__create_folders.sql

@@ -0,0 +1,32 @@
+    create table CCM_CMS.FOLDER_CONTENT_SECTION_MAP (
+        CONTENT_SECTION_ID bigint,
+        FOLDER_ID bigint not null,
+        primary key (FOLDER_ID)
+    );
+
+    create table CCM_CMS.FOLDERS (
+        TYPE varchar(255) not null,
+        OBJECT_ID bigint not null,
+        primary key (OBJECT_ID)
+    );
+
+alter table CCM_CMS.CONTENT_SECTIONS
+    drop constraint if exists FKajweudfxaf7g2ydr2hcgqwcib;
+
+alter table CCM_CMS.CONTENT_SECTIONS
+    drop constraint if exists FK6g7kw4b6diqa0nks45ilp0vhs;
+
+alter table CCM_CMS.CONTENT_SECTIONS 
+        add constraint FKavcn4aakxsb7kt7hmqlx0ecu6 
+        foreign key (ROOT_ASSETS_FOLDER_ID) 
+        references CCM_CMS.FOLDERS;
+
+    alter table CCM_CMS.FOLDER_CONTENT_SECTION_MAP 
+        add constraint FKmmb7728dp707dljq282ch47k3 
+        foreign key (FOLDER_ID) 
+        references CCM_CMS.FOLDERS;
+
+    alter table CCM_CMS.FOLDERS 
+        add constraint FK2ag06r5ywtuji2pkt68etlg48 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CATEGORIES;

ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_7__create_folders.sql

@@ -0,0 +1,42 @@
+    create table CCM_CMS.FOLDER_CONTENT_SECTION_MAP (
+        CONTENT_SECTION_ID int8,
+        FOLDER_ID int8 not null,
+        primary key (FOLDER_ID)
+    );
+
+    create table CCM_CMS.FOLDERS (
+        TYPE varchar(255) not null,
+        OBJECT_ID int8 not null,
+        primary key (OBJECT_ID)
+    );
+
+alter table CCM_CMS.CONTENT_SECTIONS
+    drop constraint if exists FKajweudfxaf7g2ydr2hcgqwcib;
+
+alter table CCM_CMS.CONTENT_SECTIONS
+    drop constraint if exists FK6g7kw4b6diqa0nks45ilp0vhs;
+
+    alter table CCM_CMS.CONTENT_SECTIONS 
+        add constraint FKavcn4aakxsb7kt7hmqlx0ecu6 
+        foreign key (ROOT_ASSETS_FOLDER_ID) 
+        references CCM_CMS.FOLDERS;
+
+    alter table CCM_CMS.CONTENT_SECTIONS 
+        add constraint FKd5sahsfsycq3i5icf3122ne8e 
+        foreign key (ROOT_DOCUMENTS_FOLDER_ID) 
+        references CCM_CMS.FOLDERS;
+
+    alter table CCM_CMS.FOLDER_CONTENT_SECTION_MAP 
+        add constraint FKnof2m7o4f0ufrugeh4g5wt3g9 
+        foreign key (CONTENT_SECTION_ID) 
+        references CCM_CMS.CONTENT_SECTIONS;
+
+    alter table CCM_CMS.FOLDER_CONTENT_SECTION_MAP 
+        add constraint FKmmb7728dp707dljq282ch47k3 
+        foreign key (FOLDER_ID) 
+        references CCM_CMS.FOLDERS;
+
+    alter table CCM_CMS.FOLDERS 
+        add constraint FK2ag06r5ywtuji2pkt68etlg48 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CATEGORIES;

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

@@ -103,8 +103,8 @@ public class ContentSectionManagerTest {
     public static WebArchive createDeployment() {
         return ShrinkWrap
             .create(WebArchive.class,
-                        "LibreCCM-org.libreccm.cms.contentsection.ContentSectionManagerTest.war").
+                    "LibreCCM-org.libreccm.cms.contentsection.ContentSectionManagerTest.war")
-                addPackage(org.libreccm.auditing.CcmRevision.class.getPackage())
+            .addPackage(org.libreccm.auditing.CcmRevision.class.getPackage())
             .addPackage(org.libreccm.categorization.Categorization.class
                 .getPackage())
             .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage())
@@ -133,6 +133,9 @@ public class ContentSectionManagerTest {
                 com.arsdigita.ui.admin.applications.DefaultApplicationInstanceForm.class)
             .addClass(
                 com.arsdigita.ui.admin.applications.DefaultApplicationSettingsPane.class)
+            .addClass(org.libreccm.modules.Module.class)
+            .addClass(org.libreccm.modules.RequiredModule.class)
+            .addClass(org.libreccm.portation.Marshals.class)
             .addPackage(com.arsdigita.cms.dispatcher.ItemResolver.class.
                 getPackage())
             .addPackage(com.arsdigita.util.Lockable.class.getPackage())
@@ -143,7 +146,9 @@ public class ContentSectionManagerTest {
                 .getPackage())
             .addPackage(org.librecms.lifecycle.Lifecycle.class.getPackage())
             .addPackage(ContentSection.class.getPackage())
-                .addAsLibraries(getModuleDependencies())
+            .addPackage(org.libreccm.tests.categories.IntegrationTest.class
+                .getPackage())
+            //.addAsLibraries(getModuleDependencies())
             .addAsLibraries(getCcmCoreDependencies())
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")

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

@@ -60,7 +60,16 @@ public class DatasetsTest extends DatasetsVerifier {
             "/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-same-folder.xml",
             "/datasets/org/librecms/contentsection/ContentItemManagerTest/after-publish.xml",
             "/datasets/org/librecms/contentsection/ContentItemManagerTest/after-republish.xml",
-            "/datasets/org/librecms/contentsection/ContentItemManagerTest/after-unpublish.xml"});
+            "/datasets/org/librecms/contentsection/ContentItemManagerTest/after-unpublish.xml",
+
+            "/datasets/org/librecms/contentsection/FolderManagerTest/data.xml",
+            "/datasets/org/librecms/contentsection/FolderManagerTest/after-create-docs-folder.xml",
+            "/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",
+
+        });
     }
 
     public DatasetsTest(final String datasetPath) {

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

@@ -0,0 +1,578 @@
+/*
+ * Copyright (C) 2016 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.librecms.contentsection;
+
+import static org.libreccm.testutils.DependenciesHelpers.*;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.ShouldThrowException;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.junit.InSequence;
+import org.jboss.arquillian.persistence.CreateSchema;
+import org.jboss.arquillian.persistence.PersistenceTest;
+import org.jboss.arquillian.persistence.ShouldMatchDataSet;
+import org.jboss.arquillian.persistence.UsingDataSet;
+import org.jboss.arquillian.transaction.api.annotation.TransactionMode;
+import org.jboss.arquillian.transaction.api.annotation.Transactional;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.libreccm.tests.categories.IntegrationTest;
+
+import javax.inject.Inject;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@Category(IntegrationTest.class)
+@RunWith(Arquillian.class)
+@PersistenceTest
+@Transactional(TransactionMode.COMMIT)
+@CreateSchema({"create_ccm_cms_schema.sql"})
+public class FolderManagerTest {
+
+    @Inject
+    private FolderRepository folderRepo;
+
+    @Inject
+    private FolderManager folderManager;
+
+    public FolderManagerTest() {
+    }
+
+    @BeforeClass
+    public static void setUpClass() {
+    }
+
+    @AfterClass
+    public static void tearDownClass() {
+    }
+
+    @Before
+    public void setUp() {
+    }
+
+    @After
+    public void tearDown() {
+    }
+
+    @Deployment
+    public static WebArchive createDeployment() {
+        return ShrinkWrap
+            .create(WebArchive.class,
+                    "LibreCCM-org.libreccm.cms.contentsection.ContentSectionManagerTest.war")
+            .addPackage(org.libreccm.auditing.CcmRevision.class.getPackage())
+            .addPackage(org.libreccm.categorization.Categorization.class
+                .getPackage())
+            .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage())
+            .addPackage(org.libreccm.configuration.Configuration.class
+                .getPackage())
+            .addPackage(org.libreccm.core.CcmCore.class.getPackage())
+            .addPackage(org.libreccm.jpa.EntityManagerProducer.class
+                .getPackage())
+            .addPackage(org.libreccm.l10n.LocalizedString.class
+                .getPackage())
+            .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class.
+                getPackage())
+            .addPackage(org.libreccm.security.Permission.class.getPackage())
+            .addPackage(org.libreccm.web.CcmApplication.class.getPackage())
+            .addPackage(org.libreccm.workflow.Workflow.class.getPackage())
+            .addPackage(com.arsdigita.bebop.Component.class.getPackage())
+            .addPackage(com.arsdigita.bebop.util.BebopConstants.class
+                .getPackage())
+            .addClass(com.arsdigita.kernel.KernelConfig.class)
+            .addClass(com.arsdigita.runtime.CCMResourceManager.class)
+            .addClass(
+                com.arsdigita.ui.admin.applications.AbstractAppInstanceForm.class)
+            .addClass(
+                com.arsdigita.ui.admin.applications.AbstractAppSettingsPane.class)
+            .addClass(
+                com.arsdigita.ui.admin.applications.DefaultApplicationInstanceForm.class)
+            .addClass(
+                com.arsdigita.ui.admin.applications.DefaultApplicationSettingsPane.class)
+            .addPackage(com.arsdigita.cms.dispatcher.ItemResolver.class.
+                getPackage())
+            .addPackage(com.arsdigita.util.Lockable.class.getPackage())
+            .addPackage(com.arsdigita.web.BaseServlet.class.getPackage())
+            .addPackage(org.librecms.Cms.class.getPackage())
+            .addPackage(org.librecms.assets.Asset.class.getPackage())
+            .addPackage(org.librecms.attachments.AttachmentList.class
+                .getPackage())
+            .addPackage(org.librecms.lifecycle.Lifecycle.class.getPackage())
+            .addPackage(ContentSection.class.getPackage())
+            .addPackage(org.libreccm.tests.categories.IntegrationTest.class
+                .getPackage())
+            //            .addAsLibraries(getModuleDependencies())
+            .addAsLibraries(getCcmCoreDependencies())
+            .addAsResource("test-persistence.xml",
+                           "META-INF/persistence.xml")
+            .addAsResource("configs/shiro.ini", "shiro.ini")
+            .addAsWebInfResource("test-web.xml", "web.xml")
+            .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml");
+    }
+
+    @Test
+    @InSequence(10)
+    public void checkInjection() {
+        assertThat(folderRepo, is(not(nullValue())));
+        assertThat(folderManager, is(not(nullValue())));
+    }
+
+    @Test
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "FolderManagerTest/data.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                    + "FolderManagerTest/after-create-docs-folder.xml",
+        excludeColumns = {"object_id",
+                          "folder_id",
+                          "uuid",
+                          "unique_id",
+                          "category_order",
+                          "content_section_id"})
+    @InSequence(1000)
+    public void createDocumentsFolder() {
+        final Folder parent = folderRepo.findById(-2005L);
+        assertThat(parent, is(not(nullValue())));
+
+        final Folder test = folderManager.createFolder("test", parent);
+
+        assertThat(test, is(not(nullValue())));
+        assertThat(test.getName(), is(equalTo("test")));
+        assertThat(test.getSection().getObjectId(), is(-1100L));
+    }
+
+    @Test
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "FolderManagerTest/data.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                    + "FolderManagerTest/after-create-assets-folder.xml",
+        excludeColumns = {"object_id",
+                          "folder_id",
+                          "uuid",
+                          "unique_id",
+                          "category_order",
+                          "content_section_id"})
+    @InSequence(1100)
+    public void createAssetsFolder() {
+        final Folder parent = folderRepo.findById(-2013L);
+        assertThat(parent, is(not(nullValue())));
+
+        final Folder test = folderManager.createFolder("test", parent);
+
+        assertThat(test, is(not(nullValue())));
+        assertThat(test.getName(), is(equalTo("test")));
+        assertThat(test.getSection().getObjectId(), is(-1100L));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "FolderManagerTest/data.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                    + "FolderManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    @InSequence(1400)
+    public void createFolderNoParent() {
+        folderManager.createFolder("test", null);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "FolderManagerTest/data.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                    + "FolderManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    @InSequence(1500)
+    public void createFolderNullName() {
+        final Folder parent = folderRepo.findById(-2005L);
+        assertThat(parent, is(not(nullValue())));
+
+        final Folder test = folderManager.createFolder(null, parent);
+
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "FolderManagerTest/data.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                    + "FolderManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    @InSequence(1500)
+    public void createFolderEmptyName() {
+        final Folder parent = folderRepo.findById(-2005L);
+        assertThat(parent, is(not(nullValue())));
+
+        final Folder test = folderManager.createFolder(" ", parent);
+
+    }
+
+    @Test
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "FolderManagerTest/data.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                    + "FolderManagerTest/after-delete-folder.xml",
+        excludeColumns = {"object_id"})
+    @InSequence(2000)
+    public void deleteFolder() {
+        //docs-1-1-1
+        final Folder folder = folderRepo.findById(-2007L);
+        folderManager.deleteFolder(folder);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "FolderManagerTest/data.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                    + "FolderManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    @InSequence(2100)
+    public void deleteNonEmptyFolder() {
+        final Folder folder = folderRepo.findById(-2008L);
+        folderManager.deleteFolder(folder);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "FolderManagerTest/data.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                    + "FolderManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    @InSequence(2100)
+    public void deleteNonEmptySubFolder() {
+        final Folder folder = folderRepo.findById(-2006L);
+        folderManager.deleteFolder(folder);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "FolderManagerTest/data.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                    + "FolderManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    @InSequence(2210)
+    public void deleteRootFolder() {
+        final Folder folder = folderRepo.findById(-2003L);
+        folderManager.deleteFolder(folder);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "FolderManagerTest/data.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                    + "FolderManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    @InSequence(2220)
+    public void deleteNullFolder() {
+        folderManager.deleteFolder(null);
+    }
+
+    @Test
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "FolderManagerTest/data.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                    + "FolderManagerTest/after-move-folder.xml",
+        excludeColumns = {"category_order"})
+    @InSequence(3000)
+    public void moveFolder() {
+        //docs-1-1-2 to docs-2
+        final Folder folder = folderRepo.findById(-2008L);
+        final Folder target = folderRepo.findById(-2010L);
+
+        folderManager.moveFolder(folder, target);
+    }
+
+    @Test
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "FolderManagerTest/data.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                    + "FolderManagerTest/after-move-folder-same-name.xml",
+        excludeColumns = {"category_order"})
+    @InSequence(3010)
+    public void moveFolderTargetFolderSameName() {
+        //docs-1/downloads to /docs-2/
+
+        final Folder folder = folderRepo.findById(-2009L);
+        final Folder target = folderRepo.findById(-2010L);
+
+        folderManager.moveFolder(folder, target);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "FolderManagerTest/data.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                    + "FolderManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    @InSequence(3100)
+    public void moveDocumentsFolderToAssetsFolder() {
+        final Folder folder = folderRepo.findById(-2009L);
+        final Folder target = folderRepo.findById(-2014L);
+
+        folderManager.moveFolder(folder, target);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "FolderManagerTest/data.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                    + "FolderManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    @InSequence(3110)
+    public void moveAssetsFolderToDocumentsFolder() {
+        final Folder folder = folderRepo.findById(-2014L);
+        final Folder target = folderRepo.findById(-2010L);
+
+        folderManager.moveFolder(folder, target);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "FolderManagerTest/data.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                    + "FolderManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    @InSequence(3110)
+    public void moveFolderToItself() {
+        final Folder folder = folderRepo.findById(-2008L);
+        
+        folderManager.moveFolder(folder, folder);
+    }
+    
+    @Test(expected = IllegalArgumentException.class)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "FolderManagerTest/data.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                    + "FolderManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    @InSequence(3200)
+    public void moveFolderNull() {
+        final Folder target = folderRepo.findById(-2010L);
+        folderManager.moveFolder(null, target);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "FolderManagerTest/data.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                    + "FolderManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    @InSequence(3210)
+    public void moveFolderTargetNull() {
+        final Folder folder = folderRepo.findById(-2008L);
+        
+        folderManager.moveFolder(folder, null);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "FolderManagerTest/data.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                    + "FolderManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    @InSequence(3300)
+    public void moveFolderWithLiveItems() {
+        final Folder folder = folderRepo.findById(-2011L);
+        final Folder target = folderRepo.findById(-2010L);
+
+        folderManager.moveFolder(folder, target);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "FolderManagerTest/data.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                    + "FolderManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    @InSequence(3310)
+    public void moveFolderWithLiveItemsInSubFolder() {
+        final Folder folder = folderRepo.findById(-2010L);
+        final Folder target = folderRepo.findById(-2005L);
+
+        folderManager.moveFolder(folder, target);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "FolderManagerTest/data.xml")
+    @ShouldMatchDataSet(
+        value = "datasets/org/librecms/contentsection/"
+                    + "FolderManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    @InSequence(3320)
+    public void moveFolderToOtherSection() {
+        final Folder folder = folderRepo.findById(-2008L);
+        final Folder target = folderRepo.findById(-2003L);
+
+        folderManager.moveFolder(folder, target);
+    }
+
+    @Test
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "FolderManagerTest/data.xml")
+    @InSequence(3400)
+    public void getFolderPath() {
+        final Folder infoRoot = folderRepo.findById(-2001L);
+        final Folder infoAssets = folderRepo.findById(-2002L);
+        final Folder projectsRoot = folderRepo.findById(-2003L);
+        final Folder projectsAssets = folderRepo.findById(-2004L);
+        final Folder docs1 = folderRepo.findById(-2005L);
+        final Folder docs11 = folderRepo.findById(-2006L);
+        final Folder docs111 = folderRepo.findById(-2007L);
+        final Folder docs112 = folderRepo.findById(-2008L);
+        final Folder downloads1 = folderRepo.findById(-2009L);
+        final Folder docs2 = folderRepo.findById(-2010L);
+        final Folder docs21 = folderRepo.findById(-2011L);
+        final Folder downloads2 = folderRepo.findById(-2012L);
+        final Folder assets1 = folderRepo.findById(-2013L);
+        final Folder assets11 = folderRepo.findById(-2014L);
+        final Folder assets12 = folderRepo.findById(-2015L);
+        
+        assertThat(folderManager.getFolderPath(infoRoot), 
+                   is(equalTo("/info_root/")));
+        assertThat(folderManager.getFolderPath(infoAssets), 
+                   is(equalTo("/info_assets/")));
+        assertThat(folderManager.getFolderPath(projectsRoot), 
+                   is(equalTo("/projects_root/")));
+        assertThat(folderManager.getFolderPath(projectsAssets), 
+                   is(equalTo("/projects_assets/")));
+        assertThat(folderManager.getFolderPath(docs1), 
+                   is(equalTo("/info_root/docs-1/")));
+        assertThat(folderManager.getFolderPath(docs11), 
+                   is(equalTo("/info_root/docs-1/docs-1-1/")));
+        assertThat(folderManager.getFolderPath(docs111), 
+                   is(equalTo("/info_root/docs-1/docs-1-1/docs-1-1-1/")));
+        assertThat(folderManager.getFolderPath(docs112), 
+                   is(equalTo("/info_root/docs-1/docs-1-1/docs-1-1-2/")));
+        assertThat(folderManager.getFolderPath(downloads1), 
+                   is(equalTo("/info_root/docs-1/downloads/")));
+        assertThat(folderManager.getFolderPath(docs2), 
+                   is(equalTo("/info_root/docs-2/")));
+        assertThat(folderManager.getFolderPath(docs21), 
+                   is(equalTo("/info_root/docs-2/docs-2-1/")));
+        assertThat(folderManager.getFolderPath(downloads2), 
+                   is(equalTo("/info_root/docs-2/downloads/")));
+        assertThat(folderManager.getFolderPath(assets1), 
+                   is(equalTo("/info_assets/assets-1/")));
+        assertThat(folderManager.getFolderPath(assets11), 
+                   is(equalTo("/info_assets/assets-1/assets-1-1/")));
+        assertThat(folderManager.getFolderPath(assets12), 
+                   is(equalTo("/info_assets/assets-1/assets-1-2/")));
+    }
+
+    @Test
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "FolderManagerTest/data.xml")
+    @InSequence(3410)
+    public void getFolderPathWithContentSection() {
+        final Folder infoRoot = folderRepo.findById(-2001L);
+        final Folder infoAssets = folderRepo.findById(-2002L);
+        final Folder projectsRoot = folderRepo.findById(-2003L);
+        final Folder projectsAssets = folderRepo.findById(-2004L);
+        final Folder docs1 = folderRepo.findById(-2005L);
+        final Folder docs11 = folderRepo.findById(-2006L);
+        final Folder docs111 = folderRepo.findById(-2007L);
+        final Folder docs112 = folderRepo.findById(-2008L);
+        final Folder downloads1 = folderRepo.findById(-2009L);
+        final Folder docs2 = folderRepo.findById(-2010L);
+        final Folder docs21 = folderRepo.findById(-2011L);
+        final Folder downloads2 = folderRepo.findById(-2012L);
+        final Folder assets1 = folderRepo.findById(-2013L);
+        final Folder assets11 = folderRepo.findById(-2014L);
+        final Folder assets12 = folderRepo.findById(-2015L);
+        
+        assertThat(folderManager.getFolderPath(infoRoot, true), 
+                   is(equalTo("info:/info_root/")));
+        assertThat(folderManager.getFolderPath(infoAssets, true), 
+                   is(equalTo("info:/info_assets/")));
+        assertThat(folderManager.getFolderPath(projectsRoot, true), 
+                   is(equalTo("projects:/projects_root/")));
+        assertThat(folderManager.getFolderPath(projectsAssets, true), 
+                   is(equalTo("projects:/projects_assets/")));
+        assertThat(folderManager.getFolderPath(docs1, true), 
+                   is(equalTo("info:/info_root/docs-1/")));
+        assertThat(folderManager.getFolderPath(docs11, true), 
+                   is(equalTo("info:/info_root/docs-1/docs-1-1/")));
+        assertThat(folderManager.getFolderPath(docs111, true), 
+                   is(equalTo("info:/info_root/docs-1/docs-1-1/docs-1-1-1/")));
+        assertThat(folderManager.getFolderPath(docs112, true), 
+                   is(equalTo("info:/info_root/docs-1/docs-1-1/docs-1-1-2/")));
+        assertThat(folderManager.getFolderPath(downloads1, true), 
+                   is(equalTo("info:/info_root/docs-1/downloads/")));
+        assertThat(folderManager.getFolderPath(docs2, true), 
+                   is(equalTo("info:/info_root/docs-2/")));
+        assertThat(folderManager.getFolderPath(docs21, true), 
+                   is(equalTo("info:/info_root/docs-2/docs-2-1/")));
+        assertThat(folderManager.getFolderPath(downloads2, true), 
+                   is(equalTo("info:/info_root/docs-2/downloads/")));
+        assertThat(folderManager.getFolderPath(assets1, true), 
+                   is(equalTo("info:/info_assets/assets-1/")));
+        assertThat(folderManager.getFolderPath(assets11, true), 
+                   is(equalTo("info:/info_assets/assets-1/assets-1-1/")));
+        assertThat(folderManager.getFolderPath(assets12, true), 
+                   is(equalTo("info:/info_assets/assets-1/assets-1-2/")));
+    }
+    
+    @Test(expected = IllegalArgumentException.class)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "FolderManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    @InSequence(3410)
+    public void getFolderPathNull() {
+        folderManager.getFolderPath(null);
+    }
+    
+    @Test(expected = IllegalArgumentException.class)
+    @UsingDataSet("datasets/org/librecms/contentsection/"
+                      + "FolderManagerTest/data.xml")
+    @ShouldThrowException(IllegalArgumentException.class)
+    @InSequence(3410)
+    public void getFolderPathNullWithContentSection() {
+        folderManager.getFolderPath(null, true);
+    }
+
+}

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

@@ -512,6 +512,18 @@ CREATE SCHEMA ccm_cms;
         primary key (ASSET_ID, REV)
     );
 
+    create table CCM_CMS.FOLDER_CONTENT_SECTION_MAP (
+        CONTENT_SECTION_ID bigint,
+        FOLDER_ID bigint not null,
+        primary key (FOLDER_ID)
+    );
+
+    create table CCM_CMS.FOLDERS (
+        TYPE varchar(255) not null,
+        OBJECT_ID bigint not null,
+        primary key (OBJECT_ID)
+    );
+
     create table CCM_CMS.IMAGES (
         HEIGHT bigint,
         WIDTH bigint,
@@ -1361,11 +1373,11 @@ CREATE SCHEMA ccm_cms;
         SETTING_ID bigint not null,
         CONFIGURATION_CLASS varchar(512) not null,
         NAME varchar(512) not null,
+        SETTING_VALUE_LONG bigint,
+        SETTING_VALUE_BOOLEAN boolean,
+        SETTING_VALUE_BIG_DECIMAL decimal(19,2),
         SETTING_VALUE_STRING varchar(1024),
         SETTING_VALUE_DOUBLE double,
-        SETTING_VALUE_BOOLEAN boolean,
-        SETTING_VALUE_LONG bigint,
-        SETTING_VALUE_BIG_DECIMAL decimal(19,2),
         primary key (SETTING_ID)
     );
 
@@ -1787,14 +1799,14 @@ create sequence hibernate_sequence start with 1 increment by 1;
         references CCM_CMS.CONTENT_SECTIONS;
 
     alter table CCM_CMS.CONTENT_SECTIONS 
-        add constraint FKajweudfxaf7g2ydr2hcgqwcib 
+        add constraint FKavcn4aakxsb7kt7hmqlx0ecu6 
         foreign key (ROOT_ASSETS_FOLDER_ID) 
-        references CCM_CORE.CATEGORIES;
+        references CCM_CMS.FOLDERS;
 
     alter table CCM_CMS.CONTENT_SECTIONS 
-        add constraint FK6g7kw4b6diqa0nks45ilp0vhs 
+        add constraint FKd5sahsfsycq3i5icf3122ne8e 
         foreign key (ROOT_DOCUMENTS_FOLDER_ID) 
-        references CCM_CORE.CATEGORIES;
+        references CCM_CMS.FOLDERS;
 
     alter table CCM_CMS.CONTENT_SECTIONS 
         add constraint FK72jh0axiiru87i61mppvaiv96 
@@ -1981,6 +1993,21 @@ create sequence hibernate_sequence start with 1 increment by 1;
         foreign key (ASSET_ID, REV) 
         references CCM_CMS.BINARY_ASSETS_AUD;
 
+    alter table CCM_CMS.FOLDER_CONTENT_SECTION_MAP 
+        add constraint FKnof2m7o4f0ufrugeh4g5wt3g9 
+        foreign key (CONTENT_SECTION_ID) 
+        references CCM_CMS.CONTENT_SECTIONS;
+
+    alter table CCM_CMS.FOLDER_CONTENT_SECTION_MAP 
+        add constraint FKmmb7728dp707dljq282ch47k3 
+        foreign key (FOLDER_ID) 
+        references CCM_CMS.FOLDERS;
+
+    alter table CCM_CMS.FOLDERS 
+        add constraint FK2ag06r5ywtuji2pkt68etlg48 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CATEGORIES;
+
     alter table CCM_CMS.IMAGES 
         add constraint FK51ja1101epvl74auenv6sqyev 
         foreign key (LEGAL_METADATA_ID) 

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

@@ -7,6 +7,7 @@ CREATE SCHEMA ccm_core;
 CREATE SCHEMA ccm_cms;
 
 
+
     create table CCM_CMS.ARTICLE_LEADS (
         OBJECT_ID int8 not null,
         LOCALIZED_VALUE text,
@@ -512,6 +513,18 @@ CREATE SCHEMA ccm_cms;
         primary key (ASSET_ID, REV)
     );
 
+    create table CCM_CMS.FOLDER_CONTENT_SECTION_MAP (
+        CONTENT_SECTION_ID int8,
+        FOLDER_ID int8 not null,
+        primary key (FOLDER_ID)
+    );
+
+    create table CCM_CMS.FOLDERS (
+        TYPE varchar(255) not null,
+        OBJECT_ID int8 not null,
+        primary key (OBJECT_ID)
+    );
+
     create table CCM_CMS.IMAGES (
         HEIGHT int8,
         WIDTH int8,
@@ -1361,11 +1374,11 @@ CREATE SCHEMA ccm_cms;
         SETTING_ID int8 not null,
         CONFIGURATION_CLASS varchar(512) not null,
         NAME varchar(512) not null,
+        SETTING_VALUE_LONG int8,
+        SETTING_VALUE_BOOLEAN boolean,
+        SETTING_VALUE_BIG_DECIMAL numeric(19, 2),
         SETTING_VALUE_STRING varchar(1024),
         SETTING_VALUE_DOUBLE float8,
-        SETTING_VALUE_BOOLEAN boolean,
-        SETTING_VALUE_LONG int8,
-        SETTING_VALUE_BIG_DECIMAL numeric(19, 2),
         primary key (SETTING_ID)
     );
 
@@ -1787,14 +1800,14 @@ create sequence hibernate_sequence start 1 increment 1;
         references CCM_CMS.CONTENT_SECTIONS;
 
     alter table CCM_CMS.CONTENT_SECTIONS 
-        add constraint FKajweudfxaf7g2ydr2hcgqwcib 
+        add constraint FKavcn4aakxsb7kt7hmqlx0ecu6 
         foreign key (ROOT_ASSETS_FOLDER_ID) 
-        references CCM_CORE.CATEGORIES;
+        references CCM_CMS.FOLDERS;
 
     alter table CCM_CMS.CONTENT_SECTIONS 
-        add constraint FK6g7kw4b6diqa0nks45ilp0vhs 
+        add constraint FKd5sahsfsycq3i5icf3122ne8e 
         foreign key (ROOT_DOCUMENTS_FOLDER_ID) 
-        references CCM_CORE.CATEGORIES;
+        references CCM_CMS.FOLDERS;
 
     alter table CCM_CMS.CONTENT_SECTIONS 
         add constraint FK72jh0axiiru87i61mppvaiv96 
@@ -1981,6 +1994,21 @@ create sequence hibernate_sequence start 1 increment 1;
         foreign key (ASSET_ID, REV) 
         references CCM_CMS.BINARY_ASSETS_AUD;
 
+    alter table CCM_CMS.FOLDER_CONTENT_SECTION_MAP 
+        add constraint FKnof2m7o4f0ufrugeh4g5wt3g9 
+        foreign key (CONTENT_SECTION_ID) 
+        references CCM_CMS.CONTENT_SECTIONS;
+
+    alter table CCM_CMS.FOLDER_CONTENT_SECTION_MAP 
+        add constraint FKmmb7728dp707dljq282ch47k3 
+        foreign key (FOLDER_ID) 
+        references CCM_CMS.FOLDERS;
+
+    alter table CCM_CMS.FOLDERS 
+        add constraint FK2ag06r5ywtuji2pkt68etlg48 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CATEGORIES;
+
     alter table CCM_CMS.IMAGES 
         add constraint FK51ja1101epvl74auenv6sqyev 
         foreign key (LEGAL_METADATA_ID) 

ccm-cms/src/test/resources/datasets/create_ccm_cms_schema.sql

@@ -6,7 +6,6 @@ DROP SEQUENCE IF EXISTS hibernate_sequence;
 CREATE SCHEMA ccm_core;
 CREATE SCHEMA ccm_cms;
 
-
     create table CCM_CMS.ARTICLE_LEADS (
         OBJECT_ID bigint not null,
         LOCALIZED_VALUE longvarchar,
@@ -512,6 +511,18 @@ CREATE SCHEMA ccm_cms;
         primary key (ASSET_ID, REV)
     );
 
+    create table CCM_CMS.FOLDER_CONTENT_SECTION_MAP (
+        CONTENT_SECTION_ID bigint,
+        FOLDER_ID bigint not null,
+        primary key (FOLDER_ID)
+    );
+
+    create table CCM_CMS.FOLDERS (
+        TYPE varchar(255) not null,
+        OBJECT_ID bigint not null,
+        primary key (OBJECT_ID)
+    );
+
     create table CCM_CMS.IMAGES (
         HEIGHT bigint,
         WIDTH bigint,
@@ -1361,11 +1372,11 @@ CREATE SCHEMA ccm_cms;
         SETTING_ID bigint not null,
         CONFIGURATION_CLASS varchar(512) not null,
         NAME varchar(512) not null,
+        SETTING_VALUE_LONG bigint,
+        SETTING_VALUE_BOOLEAN boolean,
+        SETTING_VALUE_BIG_DECIMAL decimal(19,2),
         SETTING_VALUE_STRING varchar(1024),
         SETTING_VALUE_DOUBLE double,
-        SETTING_VALUE_BOOLEAN boolean,
-        SETTING_VALUE_LONG bigint,
-        SETTING_VALUE_BIG_DECIMAL decimal(19,2),
         primary key (SETTING_ID)
     );
 
@@ -1787,14 +1798,14 @@ create sequence hibernate_sequence start with 1 increment by 1;
         references CCM_CMS.CONTENT_SECTIONS;
 
     alter table CCM_CMS.CONTENT_SECTIONS 
-        add constraint FKajweudfxaf7g2ydr2hcgqwcib 
+        add constraint FKavcn4aakxsb7kt7hmqlx0ecu6 
         foreign key (ROOT_ASSETS_FOLDER_ID) 
-        references CCM_CORE.CATEGORIES;
+        references CCM_CMS.FOLDERS;
 
     alter table CCM_CMS.CONTENT_SECTIONS 
-        add constraint FK6g7kw4b6diqa0nks45ilp0vhs 
+        add constraint FKd5sahsfsycq3i5icf3122ne8e 
         foreign key (ROOT_DOCUMENTS_FOLDER_ID) 
-        references CCM_CORE.CATEGORIES;
+        references CCM_CMS.FOLDERS;
 
     alter table CCM_CMS.CONTENT_SECTIONS 
         add constraint FK72jh0axiiru87i61mppvaiv96 
@@ -1981,6 +1992,21 @@ create sequence hibernate_sequence start with 1 increment by 1;
         foreign key (ASSET_ID, REV) 
         references CCM_CMS.BINARY_ASSETS_AUD;
 
+    alter table CCM_CMS.FOLDER_CONTENT_SECTION_MAP 
+        add constraint FKnof2m7o4f0ufrugeh4g5wt3g9 
+        foreign key (CONTENT_SECTION_ID) 
+        references CCM_CMS.CONTENT_SECTIONS;
+
+    alter table CCM_CMS.FOLDER_CONTENT_SECTION_MAP 
+        add constraint FKmmb7728dp707dljq282ch47k3 
+        foreign key (FOLDER_ID) 
+        references CCM_CMS.FOLDERS;
+
+    alter table CCM_CMS.FOLDERS 
+        add constraint FK2ag06r5ywtuji2pkt68etlg48 
+        foreign key (OBJECT_ID) 
+        references CCM_CORE.CATEGORIES;
+
     alter table CCM_CMS.IMAGES 
         add constraint FK51ja1101epvl74auenv6sqyev 
         foreign key (LEGAL_METADATA_ID) 

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-other-folder.xml

@@ -198,11 +198,29 @@
                            application_type="org.librecms.contentsection.ContentSection"
                            primary_url="info" />
     
+    <ccm_cms.folders object_id="-2100" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2110" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2120" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2200" 
+                     type="ASSETS_FOLDER" />
+    
     <ccm_cms.content_sections object_id="-1100"
                               label="info"
                               root_documents_folder_id="-2100"
                               root_assets_folder_id="-2200" />
     
+    <ccm_cms.folder_content_section_map folder_id="-2100" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2110" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2120" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2200" 
+                                        content_section_id="-1100" />
+    
     <ccm_cms.content_section_workflow_templates 
         content_section_id="-1100" 
         workflow_template_id="-100" />

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-same-folder.xml

@@ -199,11 +199,29 @@
                            application_type="org.librecms.contentsection.ContentSection"
                            primary_url="info" />
     
+    <ccm_cms.folders object_id="-2100" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2110" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2120" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2200" 
+                     type="ASSETS_FOLDER" />
+    
     <ccm_cms.content_sections object_id="-1100"
                               label="info"
                               root_documents_folder_id="-2100"
                               root_assets_folder_id="-2200" />
     
+    <ccm_cms.folder_content_section_map folder_id="-2100" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2110" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2120" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2200" 
+                                        content_section_id="-1100" />
+    
     <ccm_cms.content_section_workflow_templates 
         content_section_id="-1100" 
         workflow_template_id="-100" />

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem-with-workflow.xml

@@ -222,11 +222,29 @@
                            application_type="org.librecms.contentsection.ContentSection"
                            primary_url="info" />
     
+    <ccm_cms.folders object_id="-2100" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2110" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2120" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2200" 
+                     type="ASSETS_FOLDER" />
+    
     <ccm_cms.content_sections object_id="-1100"
                               label="info"
                               root_documents_folder_id="-2100"
                               root_assets_folder_id="-2200" />
     
+    <ccm_cms.folder_content_section_map folder_id="-2100" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2110" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2120" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2200" 
+                                        content_section_id="-1100" />
+    
     <ccm_cms.content_section_workflow_templates 
         content_section_id="-1100" 
         workflow_template_id="-100" />

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

@@ -235,11 +235,29 @@
                            application_type="org.librecms.contentsection.ContentSection"
                            primary_url="info" />
     
+    <ccm_cms.folders object_id="-2100" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2110" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2120" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2200" 
+                     type="ASSETS_FOLDER" />
+    
     <ccm_cms.content_sections object_id="-1100"
                               label="info"
                               root_documents_folder_id="-2100"
                               root_assets_folder_id="-2200" />
     
+    <ccm_cms.folder_content_section_map folder_id="-2100" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2110" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2120" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2200" 
+                                        content_section_id="-1100" />
+    
     <ccm_cms.content_section_workflow_templates 
         content_section_id="-1100" 
         workflow_template_id="-100" />

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move.xml

@@ -189,11 +189,29 @@
                            application_type="org.librecms.contentsection.ContentSection"
                            primary_url="info" />
     
+    <ccm_cms.folders object_id="-2100" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2110" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2120" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2200" 
+                     type="ASSETS_FOLDER" />
+    
     <ccm_cms.content_sections object_id="-1100"
                               label="info"
                               root_documents_folder_id="-2100"
                               root_assets_folder_id="-2200" />
     
+    <ccm_cms.folder_content_section_map folder_id="-2100" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2110" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2120" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2200" 
+                                        content_section_id="-1100" />
+    
     <ccm_cms.content_section_workflow_templates 
         content_section_id="-1100" 
         workflow_template_id="-100" />

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-publish.xml

@@ -198,11 +198,29 @@
                            application_type="org.librecms.contentsection.ContentSection"
                            primary_url="info" />
     
+    <ccm_cms.folders object_id="-2100" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2110" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2120" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2200" 
+                     type="ASSETS_FOLDER" />
+    
     <ccm_cms.content_sections object_id="-1100"
                               label="info"
                               root_documents_folder_id="-2100"
                               root_assets_folder_id="-2200" />
     
+    <ccm_cms.folder_content_section_map folder_id="-2100" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2110" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2120" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2200" 
+                                        content_section_id="-1100" />
+    
     <ccm_cms.content_section_workflow_templates 
         content_section_id="-1100" 
         workflow_template_id="-100" />

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-republish.xml

@@ -201,11 +201,29 @@
                            application_type="org.librecms.contentsection.ContentSection"
                            primary_url="info" />
     
+    <ccm_cms.folders object_id="-2100" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2110" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2120" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2200" 
+                     type="ASSETS_FOLDER" />
+    
     <ccm_cms.content_sections object_id="-1100"
                               label="info"
                               root_documents_folder_id="-2100"
                               root_assets_folder_id="-2200" />
     
+    <ccm_cms.folder_content_section_map folder_id="-2100" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2110" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2120" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2200" 
+                                        content_section_id="-1100" />
+    
     <ccm_cms.content_section_workflow_templates 
         content_section_id="-1100" 
         workflow_template_id="-100" />

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-unpublish.xml

@@ -191,11 +191,29 @@
                            application_type="org.librecms.contentsection.ContentSection"
                            primary_url="info" />
     
+    <ccm_cms.folders object_id="-2100" 
+                         type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2110" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2120" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2200" 
+                     type="ASSETS_FOLDER" />
+    
     <ccm_cms.content_sections object_id="-1100"
                               label="info"
                               root_documents_folder_id="-2100"
                               root_assets_folder_id="-2200" />
     
+    <ccm_cms.folder_content_section_map folder_id="-2100" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2110" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2120" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2200" 
+                                        content_section_id="-1100" />
+    
     <ccm_cms.content_section_workflow_templates 
         content_section_id="-1100" 
         workflow_template_id="-100" />

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

@@ -189,11 +189,29 @@
                            application_type="org.librecms.contentsection.ContentSection"
                            primary_url="info" />
     
+    <ccm_cms.folders object_id="-2100" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2110" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2120" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2200" 
+                     type="ASSETS_FOLDER" />
+    
     <ccm_cms.content_sections object_id="-1100"
                               label="info"
                               root_documents_folder_id="-2100"
                               root_assets_folder_id="-2200" />
     
+    <ccm_cms.folder_content_section_map folder_id="-2100" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2110" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2120" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2200" 
+                                        content_section_id="-1100" />
+    
     <ccm_cms.content_section_workflow_templates 
         content_section_id="-1100" 
         workflow_template_id="-100" />

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemRepositoryTest/after-save.xml

@@ -87,11 +87,21 @@
                            application_type="org.librecms.contentsection.ContentSection"
                            primary_url="info" />
     
+    <ccm_cms.folders object_id="-2100"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2200"
+                     type="ASSETS_FOLDER" />
+    
     <ccm_cms.content_sections object_id="-1100"
                               label="info"
                               root_documents_folder_id="-2100"
                               root_assets_folder_id="-2200" />
         
+    <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_types object_id="-20100" 
                            content_item_class="org.librecms.contenttypes.Article" 
                            content_section_id="-1100" />

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

@@ -81,11 +81,21 @@
                            application_type="org.librecms.contentsection.ContentSection"
                            primary_url="info" />
     
+    <ccm_cms.folders object_id="-2100"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2200"
+                     type="ASSETS_FOLDER" />
+    
     <ccm_cms.content_sections object_id="-1100"
                               label="info"
                               root_documents_folder_id="-2100"
                               root_assets_folder_id="-2200" />
     
+    <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_types object_id="-20100" 
                            content_item_class="org.librecms.contenttypes.Article" 
                            content_section_id="-1100" />

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

@@ -47,11 +47,21 @@
                            application_type="org.librecms.contentsection.ContentSection"
                            primary_url="info" />
         
+    <ccm_cms.folders object_id="-2100"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2200"
+                     type="ASSETS_FOLDER" />
+    
     <ccm_cms.content_sections object_id="-1100"
                               label="info"
                               root_documents_folder_id="-2100"
                               root_assets_folder_id="-2200" />
     
+    <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_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

@@ -88,6 +88,15 @@
                            application_type="org.librecms.contentsection.ContentSection"
                            primary_url="test" />
     
+    <ccm_cms.folders object_id="-2100"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2200"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-2300"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2400"
+                     type="ASSETS_FOLDER" />
+    
     <ccm_cms.content_sections object_id="-1100"
                               label="info"
                               root_documents_folder_id="-2100"
@@ -97,6 +106,15 @@
                               root_documents_folder_id="-2300"
                               root_assets_folder_id="-2400" />
     
+    <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.folder_content_section_map folder_id="-2300"
+                                        content_section_id="-1200" />
+    <ccm_cms.folder_content_section_map folder_id="-2400"
+                                        content_section_id="-1200" />
+    
     <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-role.xml

@@ -82,11 +82,21 @@
                            application_type="org.librecms.contentsection.ContentSection"
                            primary_url="info" />
     
+    <ccm_cms.folders object_id="-2100"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2200"
+                     type="ASSETS_FOLDER" />
+    
     <ccm_cms.content_sections object_id="-1100"
                               label="info"
                               root_documents_folder_id="-2100"
                               root_assets_folder_id="-2200" />
     
+    <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_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

@@ -47,11 +47,21 @@
                            application_type="org.librecms.contentsection.ContentSection"
                            primary_url="content" />
     
+    <ccm_cms.folders object_id="-2100"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2200"
+                     type="ASSETS_FOLDER" />
+
     <ccm_cms.content_sections object_id="-1100"
                               label="content"
                               root_documents_folder_id="-2100"
                               root_assets_folder_id="-2200" />
     
+    <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_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

@@ -82,11 +82,21 @@
                            application_type="org.librecms.contentsection.ContentSection"
                            primary_url="info" />
     
+    <ccm_cms.folders object_id="-2100"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2200"
+                     type="ASSETS_FOLDER" />
+    
     <ccm_cms.content_sections object_id="-1100"
                               label="info"
                               root_documents_folder_id="-2100"
                               root_assets_folder_id="-2200" />
     
+    <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_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/FolderManagerTest/after-create-assets-folder.xml

@@ -0,0 +1,444 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+
+    <ccm_core.ccm_objects object_id="-1100"
+                          display_name="info"
+                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
+    <ccm_core.ccm_objects object_id="-1200"
+                          display_name="projects"
+                          uuid="eb7b1eec-3df4-4a42-bffa-27c80a1a7f2f" />
+    <ccm_core.ccm_objects object_id="-20100"
+                          display_name="org.librecms.contenttypes.Article"
+                          uuid="2c8ec2fb-319d-4d44-9698-697c08b2b941" />
+    <ccm_core.ccm_objects object_id="-2001"
+                          display_name="info_root"
+                          uuid="82014239-9c06-486d-ae8c-4ae47f52a699" />
+    <ccm_core.ccm_objects object_id="-2002"
+                          display_name="info_assets"
+                          uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    <ccm_core.ccm_objects object_id="-2003"
+                          display_name="projects_root"
+                          uuid="bf230ee8-8f3b-44f3-b47f-cb163679e915" />
+    <ccm_core.ccm_objects object_id="-2004"
+                          display_name="projects_assets"
+                          uuid="bd561651-6938-4502-9d96-b30b53774743" />
+    <ccm_core.ccm_objects object_id="-2005"
+                          display_name="docs-1"
+                          uuid="2dac9161-4642-4fe5-8453-8ec63ebc7809" />
+    <ccm_core.ccm_objects object_id="-2006"
+                          display_name="docs-1-1"
+                          uuid="8544f943-1167-47c4-8e48-02a69522ea3f" />
+    <ccm_core.ccm_objects object_id="-2007"
+                          display_name="docs-1-1-1"
+                          uuid="284bde5e-cdce-4727-96c2-978f187e488c" />
+    <ccm_core.ccm_objects object_id="-2008"
+                          display_name="docs-1-1-2"
+                          uuid="b3bdd84d-034e-485d-a6fb-ae36910088a4" />
+    <ccm_core.ccm_objects object_id="-2009"
+                          display_name="downloads"
+                          uuid="aeef9f75-acc8-4f91-a5fd-b54761fef279" />
+    <ccm_core.ccm_objects object_id="-2010"
+                          display_name="docs-2"
+                          uuid="88b512e1-56d0-440b-8585-035b8a91a1d1" />
+    <ccm_core.ccm_objects object_id="-2011"
+                          display_name="docs-2-1"
+                          uuid="5bfc8ff0-b01b-4ad3-87e0-d58a0725c299" />
+    <ccm_core.ccm_objects object_id="-2012"
+                          display_name="downloads"
+                          uuid="6d73746b-a3c5-486a-b29e-471190757176" />
+    <ccm_core.ccm_objects object_id="-2013"
+                          display_name="assets-1"
+                          uuid="449405b7-8e6b-4253-91af-cebdd9b2e6c3" />
+    <ccm_core.ccm_objects object_id="-2014"
+                          display_name="assets-1-1"
+                          uuid="87add7f6-7208-4dc1-9612-909606039281" />
+    <ccm_core.ccm_objects object_id="-2015"
+                          display_name="assets-1-2"
+                          uuid="ca4005e2-486d-40d2-a79c-6ccec8222ea4" />
+    <ccm_core.ccm_objects object_id="-2016"
+                          display_name="test"
+                          uuid="3396f084-5937-4724-94fb-d516a059e1b4" />
+    <ccm_core.ccm_objects object_id="-3001"
+                          display_name="article-1-1-1-a"
+                          uuid="3703e9b1-1097-42aa-9b26-56a622e8b1ad" />
+    <ccm_core.ccm_objects object_id="-3002"
+                          display_name="article-1-1-1-b"
+                          uuid="b1953269-0b67-456b-82e9-0f01b7ff1df6" />
+    <ccm_core.ccm_objects object_id="-3003"
+                          display_name="article-2-1-a"
+                          uuid="2c3b5a1b-dc00-4844-bc88-4b1e4495e4ba" />
+    <ccm_core.ccm_objects object_id="-3004"
+                          display_name="article-2-1-a"
+                          uuid="a1e24f4f-aca2-430b-beee-dad667cbe4b8" />
+    
+    <ccm_core.categories object_id="-2001" 
+                         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="-2002" 
+                         unique_id="b163f73c-9ac2-44d7-a037-de621f5ca828" 
+                         name="info_assets" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2003" 
+                         unique_id="bf230ee8-8f3b-44f3-b47f-cb163679e915" 
+                         name="projects_root" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2004" 
+                         unique_id="bd561651-6938-4502-9d96-b30b53774743" 
+                         name="projects_assets" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2005"
+                         parent_category_id="-2001" 
+                         unique_id="2dac9161-4642-4fe5-8453-8ec63ebc7809" 
+                         name="docs-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2006" 
+                         parent_category_id="-2005"
+                         unique_id="8544f943-1167-47c4-8e48-02a69522ea3f" 
+                         name="docs-1-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2007" 
+                         parent_category_id="-2006"
+                         unique_id="284bde5e-cdce-4727-96c2-978f187e488c" 
+                         name="docs-1-1-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2008" 
+                         parent_category_id="-2006"
+                         unique_id="b3bdd84d-034e-485d-a6fb-ae36910088a4" 
+                         name="docs-1-1-2" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2009" 
+                         parent_category_id="-2005"
+                         unique_id="aeef9f75-acc8-4f91-a5fd-b54761fef279" 
+                         name="downloads" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2010" 
+                         parent_category_id="-2001"
+                         unique_id="88b512e1-56d0-440b-8585-035b8a91a1d1" 
+                         name="docs-2" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2011" 
+                         parent_category_id="-2010"
+                         unique_id="5bfc8ff0-b01b-4ad3-87e0-d58a0725c299" 
+                         name="docs-2-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2012" 
+                         parent_category_id="-2010"
+                         unique_id="6d73746b-a3c5-486a-b29e-471190757176" 
+                         name="downloads" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2013" 
+                         unique_id="449405b7-8e6b-4253-91af-cebdd9b2e6c3" 
+                         parent_category_id="-2002"
+                         name="assets-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2014" 
+                         unique_id="87add7f6-7208-4dc1-9612-909606039281" 
+                         parent_category_id="-2013"
+                         name="assets-1-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2015" 
+                         parent_category_id="-2013"
+                         unique_id="ca4005e2-486d-40d2-a79c-6ccec8222ea4" 
+                         name="assets-1-2" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2016" 
+                         parent_category_id="-2013"
+                         unique_id="3396f084-5937-4724-94fb-d516a059e1b4" 
+                         name="test" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    
+    <ccm_core.category_titles object_id="-2001" 
+                              locale="en" 
+                              localized_value="info_root" />
+    <ccm_core.category_titles object_id="-2002" 
+                              locale="en" 
+                              localized_value="info_assets" />
+    <ccm_core.category_titles object_id="-2003" 
+                              locale="en" 
+                              localized_value="projects_root" />
+    <ccm_core.category_titles object_id="-2004" 
+                              locale="en" 
+                              localized_value="projects_assets" />
+    <ccm_core.category_titles object_id="-2005" 
+                              locale="en" 
+                              localized_value="docs-1" />
+    <ccm_core.category_titles object_id="-2006" 
+                              locale="en" 
+                              localized_value="docs-1-1" />
+    <ccm_core.category_titles object_id="-2007" 
+                              locale="en" 
+                              localized_value="docs-1-1-1" />
+    <ccm_core.category_titles object_id="-2008" 
+                              locale="en" 
+                              localized_value="docs-1-1-2" />
+    <ccm_core.category_titles object_id="-2009" 
+                              locale="en" 
+                              localized_value="downloads" />
+    <ccm_core.category_titles object_id="-2010" 
+                              locale="en" 
+                              localized_value="docs-2" />
+    <ccm_core.category_titles object_id="-2011" 
+                              locale="en" 
+                              localized_value="docs-2-1" />
+    <ccm_core.category_titles object_id="-2012" 
+                              locale="en" 
+                              localized_value="downloads" />
+    <ccm_core.category_titles object_id="-2013" 
+                              locale="en" 
+                              localized_value="assets-1" />
+    <ccm_core.category_titles object_id="-2014" 
+                              locale="en" 
+                              localized_value="assets-1-1" />
+    <ccm_core.category_titles object_id="-2015" 
+                              locale="en" 
+                              localized_value="assets-1-2" />
+    <ccm_core.category_titles object_id="-2016" 
+                              locale="en" 
+                              localized_value="test" />
+
+    <ccm_cms.folders object_id="-2001" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2002" 
+                     type="ASSETS_FOLDER"/>
+    <ccm_cms.folders object_id="-2003" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2004" 
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-2005" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2006" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2007" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2008" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2009" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2010" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2011" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2012" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2013" 
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-2014" 
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-2015" 
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-2016" 
+                     type="ASSETS_FOLDER" />
+    
+    <ccm_core.resources object_id="-1100" 
+                        created="2016-07-15" />
+    <ccm_core.resources object_id="-1200" 
+                        created="2016-07-15" />
+    
+    <ccm_core.resource_titles object_id="-1100" 
+                              locale="en"
+                              localized_value="info" />
+    <ccm_core.resource_titles object_id="-1200" 
+                              locale="en"
+                              localized_value="projects" />
+    
+    <ccm_core.applications object_id="-1100"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="info" />
+    <ccm_core.applications object_id="-1200"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="projects" />
+    
+    <ccm_cms.content_sections object_id="-1100"
+                              label="info"
+                              root_documents_folder_id="-2001"
+                              root_assets_folder_id="-2002" />
+    <ccm_cms.content_sections object_id="-1200"
+                              label="projects"
+                              root_documents_folder_id="-2003"
+                              root_assets_folder_id="-2004" />
+    
+    <ccm_cms.folder_content_section_map folder_id="-2001" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2002" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2003" 
+                                        content_section_id="-1200" />
+    <ccm_cms.folder_content_section_map folder_id="-2004" 
+                                        content_section_id="-1200" />
+    <ccm_cms.folder_content_section_map folder_id="-2005" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2006" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2007" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2008" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2009" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2010" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2011" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2012" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2013" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2014" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2015" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2016" 
+                                        content_section_id="-1100" />
+
+    <ccm_cms.content_types object_id="-20100" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-1100" />
+    
+    <ccm_cms.content_items object_id="-3001" 
+                           item_uuid="3703e9b1-1097-42aa-9b26-56a622e8b1ad"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-3002" 
+                           item_uuid="b1953269-0b67-456b-82e9-0f01b7ff1df6"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-3003" 
+                           item_uuid="2c3b5a1b-dc00-4844-bc88-4b1e4495e4ba"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-3004" 
+                           item_uuid="2c3b5a1b-dc00-4844-bc88-4b1e4495e4ba"
+                           version="LIVE"
+                           content_type_id="-20100" />
+    
+    <ccm_cms.content_item_names object_id="-3001"
+                                locale="en"
+                                localized_value="article-1-1-1a" />
+    <ccm_cms.content_item_names object_id="-3002"
+                                locale="en"
+                                localized_value="article-1-1-1b" />
+    <ccm_cms.content_item_names object_id="-3003"
+                                locale="en"
+                                localized_value="article-2-1a" />
+    <ccm_cms.content_item_names object_id="-3004"
+                                locale="en"
+                                localized_value="article-2-1a" />
+
+    <ccm_cms.content_item_titles object_id="-3001"
+                                 locale="en"
+                                 localized_value="article-1-1-1a" />
+    <ccm_cms.content_item_titles object_id="-3002"
+                                 locale="en"
+                                 localized_value="article-1-1-1b" />
+    <ccm_cms.content_item_titles object_id="-3003"
+                                 locale="en"
+                                 localized_value="article-2-1a" />
+    <ccm_cms.content_item_titles object_id="-3004"
+                                 locale="en"
+                                 localized_value="article-2-1a" />
+
+    <ccm_cms.content_type_labels object_id="-20100"
+                                 locale="en" 
+                                 localized_value="Article" />
+
+    <ccm_cms.articles object_id="-3001" />
+    <ccm_cms.articles object_id="-3002" />
+    <ccm_cms.articles object_id="-3003" />
+    <ccm_cms.articles object_id="-3004" />
+
+    <ccm_cms.article_texts 
+        object_id="-3001"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+    <ccm_cms.article_texts 
+        object_id="-3002"
+        locale="en" 
+        localized_value="Duis quis tincidunt elit. In pharetra justo sit amet ipsum dictum, at." />
+    <ccm_cms.article_texts 
+        object_id="-3003"
+        locale="en" 
+        localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." />
+    <ccm_cms.article_texts 
+        object_id="-3004"
+        locale="en" 
+        localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." />
+
+    <ccm_core.categorizations categorization_id="-30001" 
+                              category_id="-2008" 
+                              object_id="-3001" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30002" 
+                              category_id="-2008" 
+                              object_id="-3002" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30003" 
+                              category_id="-2011" 
+                              object_id="-3003" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30004" 
+                              category_id="-2011" 
+                              object_id="-3004" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+
+</dataset>

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/FolderManagerTest/after-create-docs-folder.xml

@@ -0,0 +1,444 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+
+    <ccm_core.ccm_objects object_id="-1100"
+                          display_name="info"
+                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
+    <ccm_core.ccm_objects object_id="-1200"
+                          display_name="projects"
+                          uuid="eb7b1eec-3df4-4a42-bffa-27c80a1a7f2f" />
+    <ccm_core.ccm_objects object_id="-20100"
+                          display_name="org.librecms.contenttypes.Article"
+                          uuid="2c8ec2fb-319d-4d44-9698-697c08b2b941" />
+    <ccm_core.ccm_objects object_id="-2001"
+                          display_name="info_root"
+                          uuid="82014239-9c06-486d-ae8c-4ae47f52a699" />
+    <ccm_core.ccm_objects object_id="-2002"
+                          display_name="info_assets"
+                          uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    <ccm_core.ccm_objects object_id="-2003"
+                          display_name="projects_root"
+                          uuid="bf230ee8-8f3b-44f3-b47f-cb163679e915" />
+    <ccm_core.ccm_objects object_id="-2004"
+                          display_name="projects_assets"
+                          uuid="bd561651-6938-4502-9d96-b30b53774743" />
+    <ccm_core.ccm_objects object_id="-2005"
+                          display_name="docs-1"
+                          uuid="2dac9161-4642-4fe5-8453-8ec63ebc7809" />
+    <ccm_core.ccm_objects object_id="-2006"
+                          display_name="docs-1-1"
+                          uuid="8544f943-1167-47c4-8e48-02a69522ea3f" />
+    <ccm_core.ccm_objects object_id="-2007"
+                          display_name="docs-1-1-1"
+                          uuid="284bde5e-cdce-4727-96c2-978f187e488c" />
+    <ccm_core.ccm_objects object_id="-2008"
+                          display_name="docs-1-1-2"
+                          uuid="b3bdd84d-034e-485d-a6fb-ae36910088a4" />
+    <ccm_core.ccm_objects object_id="-2009"
+                          display_name="downloads"
+                          uuid="aeef9f75-acc8-4f91-a5fd-b54761fef279" />
+    <ccm_core.ccm_objects object_id="-2010"
+                          display_name="docs-2"
+                          uuid="88b512e1-56d0-440b-8585-035b8a91a1d1" />
+    <ccm_core.ccm_objects object_id="-2011"
+                          display_name="docs-2-1"
+                          uuid="5bfc8ff0-b01b-4ad3-87e0-d58a0725c299" />
+    <ccm_core.ccm_objects object_id="-2012"
+                          display_name="downloads"
+                          uuid="6d73746b-a3c5-486a-b29e-471190757176" />
+    <ccm_core.ccm_objects object_id="-2013"
+                          display_name="assets-1"
+                          uuid="449405b7-8e6b-4253-91af-cebdd9b2e6c3" />
+    <ccm_core.ccm_objects object_id="-2014"
+                          display_name="assets-1-1"
+                          uuid="87add7f6-7208-4dc1-9612-909606039281" />
+    <ccm_core.ccm_objects object_id="-2015"
+                          display_name="assets-1-2"
+                          uuid="ca4005e2-486d-40d2-a79c-6ccec8222ea4" />
+    <ccm_core.ccm_objects object_id="-2016"
+                          display_name="test"
+                          uuid="3396f084-5937-4724-94fb-d516a059e1b4" />
+    <ccm_core.ccm_objects object_id="-3001"
+                          display_name="article-1-1-1-a"
+                          uuid="3703e9b1-1097-42aa-9b26-56a622e8b1ad" />
+    <ccm_core.ccm_objects object_id="-3002"
+                          display_name="article-1-1-1-b"
+                          uuid="b1953269-0b67-456b-82e9-0f01b7ff1df6" />
+    <ccm_core.ccm_objects object_id="-3003"
+                          display_name="article-2-1-a"
+                          uuid="2c3b5a1b-dc00-4844-bc88-4b1e4495e4ba" />
+    <ccm_core.ccm_objects object_id="-3004"
+                          display_name="article-2-1-a"
+                          uuid="a1e24f4f-aca2-430b-beee-dad667cbe4b8" />
+    
+    <ccm_core.categories object_id="-2001" 
+                         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="-2002" 
+                         unique_id="b163f73c-9ac2-44d7-a037-de621f5ca828" 
+                         name="info_assets" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2003" 
+                         unique_id="bf230ee8-8f3b-44f3-b47f-cb163679e915" 
+                         name="projects_root" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2004" 
+                         unique_id="bd561651-6938-4502-9d96-b30b53774743" 
+                         name="projects_assets" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2005"
+                         parent_category_id="-2001" 
+                         unique_id="2dac9161-4642-4fe5-8453-8ec63ebc7809" 
+                         name="docs-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2006" 
+                         parent_category_id="-2005"
+                         unique_id="8544f943-1167-47c4-8e48-02a69522ea3f" 
+                         name="docs-1-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2007" 
+                         parent_category_id="-2006"
+                         unique_id="284bde5e-cdce-4727-96c2-978f187e488c" 
+                         name="docs-1-1-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2008" 
+                         parent_category_id="-2006"
+                         unique_id="b3bdd84d-034e-485d-a6fb-ae36910088a4" 
+                         name="docs-1-1-2" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2009" 
+                         parent_category_id="-2005"
+                         unique_id="aeef9f75-acc8-4f91-a5fd-b54761fef279" 
+                         name="downloads" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2010" 
+                         parent_category_id="-2001"
+                         unique_id="88b512e1-56d0-440b-8585-035b8a91a1d1" 
+                         name="docs-2" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2011" 
+                         parent_category_id="-2010"
+                         unique_id="5bfc8ff0-b01b-4ad3-87e0-d58a0725c299" 
+                         name="docs-2-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2012" 
+                         parent_category_id="-2010"
+                         unique_id="6d73746b-a3c5-486a-b29e-471190757176" 
+                         name="downloads" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2013" 
+                         unique_id="449405b7-8e6b-4253-91af-cebdd9b2e6c3" 
+                         parent_category_id="-2002"
+                         name="assets-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2014" 
+                         unique_id="87add7f6-7208-4dc1-9612-909606039281" 
+                         parent_category_id="-2013"
+                         name="assets-1-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2015" 
+                         parent_category_id="-2013"
+                         unique_id="ca4005e2-486d-40d2-a79c-6ccec8222ea4" 
+                         name="assets-1-2" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2016" 
+                         parent_category_id="-2005"
+                         unique_id="3396f084-5937-4724-94fb-d516a059e1b4" 
+                         name="test" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    
+    <ccm_core.category_titles object_id="-2001" 
+                              locale="en" 
+                              localized_value="info_root" />
+    <ccm_core.category_titles object_id="-2002" 
+                              locale="en" 
+                              localized_value="info_assets" />
+    <ccm_core.category_titles object_id="-2003" 
+                              locale="en" 
+                              localized_value="projects_root" />
+    <ccm_core.category_titles object_id="-2004" 
+                              locale="en" 
+                              localized_value="projects_assets" />
+    <ccm_core.category_titles object_id="-2005" 
+                              locale="en" 
+                              localized_value="docs-1" />
+    <ccm_core.category_titles object_id="-2006" 
+                              locale="en" 
+                              localized_value="docs-1-1" />
+    <ccm_core.category_titles object_id="-2007" 
+                              locale="en" 
+                              localized_value="docs-1-1-1" />
+    <ccm_core.category_titles object_id="-2008" 
+                              locale="en" 
+                              localized_value="docs-1-1-2" />
+    <ccm_core.category_titles object_id="-2009" 
+                              locale="en" 
+                              localized_value="downloads" />
+    <ccm_core.category_titles object_id="-2010" 
+                              locale="en" 
+                              localized_value="docs-2" />
+    <ccm_core.category_titles object_id="-2011" 
+                              locale="en" 
+                              localized_value="docs-2-1" />
+    <ccm_core.category_titles object_id="-2012" 
+                              locale="en" 
+                              localized_value="downloads" />
+    <ccm_core.category_titles object_id="-2013" 
+                              locale="en" 
+                              localized_value="assets-1" />
+    <ccm_core.category_titles object_id="-2014" 
+                              locale="en" 
+                              localized_value="assets-1-1" />
+    <ccm_core.category_titles object_id="-2015" 
+                              locale="en" 
+                              localized_value="assets-1-2" />
+    <ccm_core.category_titles object_id="-2016" 
+                              locale="en" 
+                              localized_value="test" />
+
+    <ccm_cms.folders object_id="-2001" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2002" 
+                     type="ASSETS_FOLDER"/>
+    <ccm_cms.folders object_id="-2003" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2004" 
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-2005" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2006" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2007" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2008" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2009" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2010" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2011" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2012" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2013" 
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-2014" 
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-2015" 
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-2016" 
+                     type="DOCUMENTS_FOLDER" />
+    
+    <ccm_core.resources object_id="-1100" 
+                        created="2016-07-15" />
+    <ccm_core.resources object_id="-1200" 
+                        created="2016-07-15" />
+    
+    <ccm_core.resource_titles object_id="-1100" 
+                              locale="en"
+                              localized_value="info" />
+    <ccm_core.resource_titles object_id="-1200" 
+                              locale="en"
+                              localized_value="projects" />
+    
+    <ccm_core.applications object_id="-1100"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="info" />
+    <ccm_core.applications object_id="-1200"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="projects" />
+    
+    <ccm_cms.content_sections object_id="-1100"
+                              label="info"
+                              root_documents_folder_id="-2001"
+                              root_assets_folder_id="-2002" />
+    <ccm_cms.content_sections object_id="-1200"
+                              label="projects"
+                              root_documents_folder_id="-2003"
+                              root_assets_folder_id="-2004" />
+    
+    <ccm_cms.folder_content_section_map folder_id="-2001" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2002" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2003" 
+                                        content_section_id="-1200" />
+    <ccm_cms.folder_content_section_map folder_id="-2004" 
+                                        content_section_id="-1200" />
+    <ccm_cms.folder_content_section_map folder_id="-2005" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2006" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2007" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2008" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2009" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2010" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2011" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2012" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2013" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2014" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2015" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2016" 
+                                        content_section_id="-1100" />
+
+    <ccm_cms.content_types object_id="-20100" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-1100" />
+    
+    <ccm_cms.content_items object_id="-3001" 
+                           item_uuid="3703e9b1-1097-42aa-9b26-56a622e8b1ad"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-3002" 
+                           item_uuid="b1953269-0b67-456b-82e9-0f01b7ff1df6"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-3003" 
+                           item_uuid="2c3b5a1b-dc00-4844-bc88-4b1e4495e4ba"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-3004" 
+                           item_uuid="2c3b5a1b-dc00-4844-bc88-4b1e4495e4ba"
+                           version="LIVE"
+                           content_type_id="-20100" />
+    
+    <ccm_cms.content_item_names object_id="-3001"
+                                locale="en"
+                                localized_value="article-1-1-1a" />
+    <ccm_cms.content_item_names object_id="-3002"
+                                locale="en"
+                                localized_value="article-1-1-1b" />
+    <ccm_cms.content_item_names object_id="-3003"
+                                locale="en"
+                                localized_value="article-2-1a" />
+    <ccm_cms.content_item_names object_id="-3004"
+                                locale="en"
+                                localized_value="article-2-1a" />
+
+    <ccm_cms.content_item_titles object_id="-3001"
+                                 locale="en"
+                                 localized_value="article-1-1-1a" />
+    <ccm_cms.content_item_titles object_id="-3002"
+                                 locale="en"
+                                 localized_value="article-1-1-1b" />
+    <ccm_cms.content_item_titles object_id="-3003"
+                                 locale="en"
+                                 localized_value="article-2-1a" />
+    <ccm_cms.content_item_titles object_id="-3004"
+                                 locale="en"
+                                 localized_value="article-2-1a" />
+
+    <ccm_cms.content_type_labels object_id="-20100"
+                                 locale="en" 
+                                 localized_value="Article" />
+
+    <ccm_cms.articles object_id="-3001" />
+    <ccm_cms.articles object_id="-3002" />
+    <ccm_cms.articles object_id="-3003" />
+    <ccm_cms.articles object_id="-3004" />
+
+    <ccm_cms.article_texts 
+        object_id="-3001"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+    <ccm_cms.article_texts 
+        object_id="-3002"
+        locale="en" 
+        localized_value="Duis quis tincidunt elit. In pharetra justo sit amet ipsum dictum, at." />
+    <ccm_cms.article_texts 
+        object_id="-3003"
+        locale="en" 
+        localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." />
+    <ccm_cms.article_texts 
+        object_id="-3004"
+        locale="en" 
+        localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." />
+
+    <ccm_core.categorizations categorization_id="-30001" 
+                              category_id="-2008" 
+                              object_id="-3001" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30002" 
+                              category_id="-2008" 
+                              object_id="-3002" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30003" 
+                              category_id="-2011" 
+                              object_id="-3003" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30004" 
+                              category_id="-2011" 
+                              object_id="-3004" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+
+</dataset>

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/FolderManagerTest/after-delete-folder.xml

@@ -0,0 +1,408 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+
+    <ccm_core.ccm_objects object_id="-1100"
+                          display_name="info"
+                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
+    <ccm_core.ccm_objects object_id="-1200"
+                          display_name="projects"
+                          uuid="eb7b1eec-3df4-4a42-bffa-27c80a1a7f2f" />
+    <ccm_core.ccm_objects object_id="-20100"
+                          display_name="org.librecms.contenttypes.Article"
+                          uuid="2c8ec2fb-319d-4d44-9698-697c08b2b941" />
+    <ccm_core.ccm_objects object_id="-2001"
+                          display_name="info_root"
+                          uuid="82014239-9c06-486d-ae8c-4ae47f52a699" />
+    <ccm_core.ccm_objects object_id="-2002"
+                          display_name="info_assets"
+                          uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    <ccm_core.ccm_objects object_id="-2003"
+                          display_name="projects_root"
+                          uuid="bf230ee8-8f3b-44f3-b47f-cb163679e915" />
+    <ccm_core.ccm_objects object_id="-2004"
+                          display_name="projects_assets"
+                          uuid="bd561651-6938-4502-9d96-b30b53774743" />
+    <ccm_core.ccm_objects object_id="-2005"
+                          display_name="docs-1"
+                          uuid="2dac9161-4642-4fe5-8453-8ec63ebc7809" />
+    <ccm_core.ccm_objects object_id="-2006"
+                          display_name="docs-1-1"
+                          uuid="8544f943-1167-47c4-8e48-02a69522ea3f" />
+    <ccm_core.ccm_objects object_id="-2008"
+                          display_name="docs-1-1-2"
+                          uuid="b3bdd84d-034e-485d-a6fb-ae36910088a4" />
+    <ccm_core.ccm_objects object_id="-2009"
+                          display_name="downloads"
+                          uuid="aeef9f75-acc8-4f91-a5fd-b54761fef279" />
+    <ccm_core.ccm_objects object_id="-2010"
+                          display_name="docs-2"
+                          uuid="88b512e1-56d0-440b-8585-035b8a91a1d1" />
+    <ccm_core.ccm_objects object_id="-2011"
+                          display_name="docs-2-1"
+                          uuid="5bfc8ff0-b01b-4ad3-87e0-d58a0725c299" />
+    <ccm_core.ccm_objects object_id="-2012"
+                          display_name="downloads"
+                          uuid="6d73746b-a3c5-486a-b29e-471190757176" />
+    <ccm_core.ccm_objects object_id="-2013"
+                          display_name="assets-1"
+                          uuid="449405b7-8e6b-4253-91af-cebdd9b2e6c3" />
+    <ccm_core.ccm_objects object_id="-2014"
+                          display_name="assets-1-1"
+                          uuid="87add7f6-7208-4dc1-9612-909606039281" />
+    <ccm_core.ccm_objects object_id="-2015"
+                          display_name="assets-1-2"
+                          uuid="ca4005e2-486d-40d2-a79c-6ccec8222ea4" />
+    <ccm_core.ccm_objects object_id="-3001"
+                          display_name="article-1-1-1-a"
+                          uuid="3703e9b1-1097-42aa-9b26-56a622e8b1ad" />
+    <ccm_core.ccm_objects object_id="-3002"
+                          display_name="article-1-1-1-b"
+                          uuid="b1953269-0b67-456b-82e9-0f01b7ff1df6" />
+    <ccm_core.ccm_objects object_id="-3003"
+                          display_name="article-2-1-a"
+                          uuid="2c3b5a1b-dc00-4844-bc88-4b1e4495e4ba" />
+    <ccm_core.ccm_objects object_id="-3004"
+                          display_name="article-2-1-a"
+                          uuid="a1e24f4f-aca2-430b-beee-dad667cbe4b8" />
+    
+    <ccm_core.categories object_id="-2001" 
+                         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="-2002" 
+                         unique_id="b163f73c-9ac2-44d7-a037-de621f5ca828" 
+                         name="info_assets" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2003" 
+                         unique_id="bf230ee8-8f3b-44f3-b47f-cb163679e915" 
+                         name="projects_root" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2004" 
+                         unique_id="bd561651-6938-4502-9d96-b30b53774743" 
+                         name="projects_assets" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2005"
+                         parent_category_id="-2001" 
+                         unique_id="2dac9161-4642-4fe5-8453-8ec63ebc7809" 
+                         name="docs-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2006" 
+                         parent_category_id="-2005"
+                         unique_id="8544f943-1167-47c4-8e48-02a69522ea3f" 
+                         name="docs-1-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2008" 
+                         parent_category_id="-2006"
+                         unique_id="b3bdd84d-034e-485d-a6fb-ae36910088a4" 
+                         name="docs-1-1-2" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2009" 
+                         parent_category_id="-2005"
+                         unique_id="aeef9f75-acc8-4f91-a5fd-b54761fef279" 
+                         name="downloads" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2010" 
+                         parent_category_id="-2001"
+                         unique_id="88b512e1-56d0-440b-8585-035b8a91a1d1" 
+                         name="docs-2" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2011" 
+                         parent_category_id="-2010"
+                         unique_id="5bfc8ff0-b01b-4ad3-87e0-d58a0725c299" 
+                         name="docs-2-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2012" 
+                         parent_category_id="-2010"
+                         unique_id="6d73746b-a3c5-486a-b29e-471190757176" 
+                         name="downloads" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2013" 
+                         unique_id="449405b7-8e6b-4253-91af-cebdd9b2e6c3" 
+                         parent_category_id="-2002"
+                         name="assets-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2014" 
+                         unique_id="87add7f6-7208-4dc1-9612-909606039281" 
+                         parent_category_id="-2013"
+                         name="assets-1-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2015" 
+                         parent_category_id="-2013"
+                         unique_id="ca4005e2-486d-40d2-a79c-6ccec8222ea4" 
+                         name="assets-1-2" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    
+    <ccm_core.category_titles object_id="-2001" 
+                              locale="en" 
+                              localized_value="info_root" />
+    <ccm_core.category_titles object_id="-2002" 
+                              locale="en" 
+                              localized_value="info_assets" />
+    <ccm_core.category_titles object_id="-2003" 
+                              locale="en" 
+                              localized_value="projects_root" />
+    <ccm_core.category_titles object_id="-2004" 
+                              locale="en" 
+                              localized_value="projects_assets" />
+    <ccm_core.category_titles object_id="-2005" 
+                              locale="en" 
+                              localized_value="docs-1" />
+    <ccm_core.category_titles object_id="-2006" 
+                              locale="en" 
+                              localized_value="docs-1-1" />
+    <ccm_core.category_titles object_id="-2008" 
+                              locale="en" 
+                              localized_value="docs-1-1-2" />
+    <ccm_core.category_titles object_id="-2009" 
+                              locale="en" 
+                              localized_value="downloads" />
+    <ccm_core.category_titles object_id="-2010" 
+                              locale="en" 
+                              localized_value="docs-2" />
+    <ccm_core.category_titles object_id="-2011" 
+                              locale="en" 
+                              localized_value="docs-2-1" />
+    <ccm_core.category_titles object_id="-2012" 
+                              locale="en" 
+                              localized_value="downloads" />
+    <ccm_core.category_titles object_id="-2013" 
+                              locale="en" 
+                              localized_value="assets-1" />
+    <ccm_core.category_titles object_id="-2014" 
+                              locale="en" 
+                              localized_value="assets-1-1" />
+    <ccm_core.category_titles object_id="-2015" 
+                              locale="en" 
+                              localized_value="assets-1-2" />
+
+    <ccm_cms.folders object_id="-2001" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2002" 
+                     type="ASSETS_FOLDER"/>
+    <ccm_cms.folders object_id="-2003" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2004" 
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-2005" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2006" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2008" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2009" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2010" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2011" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2012" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2013" 
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-2014" 
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-2015" 
+                     type="ASSETS_FOLDER" />
+    
+    <ccm_core.resources object_id="-1100" 
+                        created="2016-07-15" />
+    <ccm_core.resources object_id="-1200" 
+                        created="2016-07-15" />
+    
+    <ccm_core.resource_titles object_id="-1100" 
+                              locale="en"
+                              localized_value="info" />
+    <ccm_core.resource_titles object_id="-1200" 
+                              locale="en"
+                              localized_value="projects" />
+    
+    <ccm_core.applications object_id="-1100"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="info" />
+    <ccm_core.applications object_id="-1200"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="projects" />
+    
+    <ccm_cms.content_sections object_id="-1100"
+                              label="info"
+                              root_documents_folder_id="-2001"
+                              root_assets_folder_id="-2002" />
+    <ccm_cms.content_sections object_id="-1200"
+                              label="projects"
+                              root_documents_folder_id="-2003"
+                              root_assets_folder_id="-2004" />
+    
+    <ccm_cms.folder_content_section_map folder_id="-2001" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2002" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2003" 
+                                        content_section_id="-1200" />
+    <ccm_cms.folder_content_section_map folder_id="-2004" 
+                                        content_section_id="-1200" />
+    <ccm_cms.folder_content_section_map folder_id="-2005" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2006" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2008" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2009" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2010" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2011" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2012" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2013" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2014" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2015" 
+                                        content_section_id="-1100" />
+
+    <ccm_cms.content_types object_id="-20100" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-1100" />
+    
+    <ccm_cms.content_items object_id="-3001" 
+                           item_uuid="3703e9b1-1097-42aa-9b26-56a622e8b1ad"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-3002" 
+                           item_uuid="b1953269-0b67-456b-82e9-0f01b7ff1df6"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-3003" 
+                           item_uuid="2c3b5a1b-dc00-4844-bc88-4b1e4495e4ba"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-3004" 
+                           item_uuid="2c3b5a1b-dc00-4844-bc88-4b1e4495e4ba"
+                           version="LIVE"
+                           content_type_id="-20100" />
+    
+    <ccm_cms.content_item_names object_id="-3001"
+                                locale="en"
+                                localized_value="article-1-1-1a" />
+    <ccm_cms.content_item_names object_id="-3002"
+                                locale="en"
+                                localized_value="article-1-1-1b" />
+    <ccm_cms.content_item_names object_id="-3003"
+                                locale="en"
+                                localized_value="article-2-1a" />
+    <ccm_cms.content_item_names object_id="-3004"
+                                locale="en"
+                                localized_value="article-2-1a" />
+
+    <ccm_cms.content_item_titles object_id="-3001"
+                                 locale="en"
+                                 localized_value="article-1-1-1a" />
+    <ccm_cms.content_item_titles object_id="-3002"
+                                 locale="en"
+                                 localized_value="article-1-1-1b" />
+    <ccm_cms.content_item_titles object_id="-3003"
+                                 locale="en"
+                                 localized_value="article-2-1a" />
+    <ccm_cms.content_item_titles object_id="-3004"
+                                 locale="en"
+                                 localized_value="article-2-1a" />
+
+    <ccm_cms.content_type_labels object_id="-20100"
+                                 locale="en" 
+                                 localized_value="Article" />
+
+    <ccm_cms.articles object_id="-3001" />
+    <ccm_cms.articles object_id="-3002" />
+    <ccm_cms.articles object_id="-3003" />
+    <ccm_cms.articles object_id="-3004" />
+
+    <ccm_cms.article_texts 
+        object_id="-3001"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+    <ccm_cms.article_texts 
+        object_id="-3002"
+        locale="en" 
+        localized_value="Duis quis tincidunt elit. In pharetra justo sit amet ipsum dictum, at." />
+    <ccm_cms.article_texts 
+        object_id="-3003"
+        locale="en" 
+        localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." />
+    <ccm_cms.article_texts 
+        object_id="-3004"
+        locale="en" 
+        localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." />
+
+    <ccm_core.categorizations categorization_id="-30001" 
+                              category_id="-2008" 
+                              object_id="-3001" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30002" 
+                              category_id="-2008" 
+                              object_id="-3002" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30003" 
+                              category_id="-2011" 
+                              object_id="-3003" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30004" 
+                              category_id="-2011" 
+                              object_id="-3004" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+
+</dataset>

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/FolderManagerTest/after-move-folder-same-name.xml

@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+
+    <ccm_core.ccm_objects object_id="-1100"
+                          display_name="info"
+                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
+    <ccm_core.ccm_objects object_id="-1200"
+                          display_name="projects"
+                          uuid="eb7b1eec-3df4-4a42-bffa-27c80a1a7f2f" />
+    <ccm_core.ccm_objects object_id="-20100"
+                          display_name="org.librecms.contenttypes.Article"
+                          uuid="2c8ec2fb-319d-4d44-9698-697c08b2b941" />
+    <ccm_core.ccm_objects object_id="-2001"
+                          display_name="info_root"
+                          uuid="82014239-9c06-486d-ae8c-4ae47f52a699" />
+    <ccm_core.ccm_objects object_id="-2002"
+                          display_name="info_assets"
+                          uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    <ccm_core.ccm_objects object_id="-2003"
+                          display_name="projects_root"
+                          uuid="bf230ee8-8f3b-44f3-b47f-cb163679e915" />
+    <ccm_core.ccm_objects object_id="-2004"
+                          display_name="projects_assets"
+                          uuid="bd561651-6938-4502-9d96-b30b53774743" />
+    <ccm_core.ccm_objects object_id="-2005"
+                          display_name="docs-1"
+                          uuid="2dac9161-4642-4fe5-8453-8ec63ebc7809" />
+    <ccm_core.ccm_objects object_id="-2006"
+                          display_name="docs-1-1"
+                          uuid="8544f943-1167-47c4-8e48-02a69522ea3f" />
+    <ccm_core.ccm_objects object_id="-2007"
+                          display_name="docs-1-1-1"
+                          uuid="284bde5e-cdce-4727-96c2-978f187e488c" />
+    <ccm_core.ccm_objects object_id="-2008"
+                          display_name="docs-1-1-2"
+                          uuid="b3bdd84d-034e-485d-a6fb-ae36910088a4" />
+    <ccm_core.ccm_objects object_id="-2009"
+                          display_name="downloads_1"
+                          uuid="aeef9f75-acc8-4f91-a5fd-b54761fef279" />
+    <ccm_core.ccm_objects object_id="-2010"
+                          display_name="docs-2"
+                          uuid="88b512e1-56d0-440b-8585-035b8a91a1d1" />
+    <ccm_core.ccm_objects object_id="-2011"
+                          display_name="docs-2-1"
+                          uuid="5bfc8ff0-b01b-4ad3-87e0-d58a0725c299" />
+    <ccm_core.ccm_objects object_id="-2012"
+                          display_name="downloads"
+                          uuid="6d73746b-a3c5-486a-b29e-471190757176" />
+    <ccm_core.ccm_objects object_id="-2013"
+                          display_name="assets-1"
+                          uuid="449405b7-8e6b-4253-91af-cebdd9b2e6c3" />
+    <ccm_core.ccm_objects object_id="-2014"
+                          display_name="assets-1-1"
+                          uuid="87add7f6-7208-4dc1-9612-909606039281" />
+    <ccm_core.ccm_objects object_id="-2015"
+                          display_name="assets-1-2"
+                          uuid="ca4005e2-486d-40d2-a79c-6ccec8222ea4" />
+    <ccm_core.ccm_objects object_id="-3001"
+                          display_name="article-1-1-1-a"
+                          uuid="3703e9b1-1097-42aa-9b26-56a622e8b1ad" />
+    <ccm_core.ccm_objects object_id="-3002"
+                          display_name="article-1-1-1-b"
+                          uuid="b1953269-0b67-456b-82e9-0f01b7ff1df6" />
+    <ccm_core.ccm_objects object_id="-3003"
+                          display_name="article-2-1-a"
+                          uuid="2c3b5a1b-dc00-4844-bc88-4b1e4495e4ba" />
+    <ccm_core.ccm_objects object_id="-3004"
+                          display_name="article-2-1-a"
+                          uuid="a1e24f4f-aca2-430b-beee-dad667cbe4b8" />
+    
+    <ccm_core.categories object_id="-2001" 
+                         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="-2002" 
+                         unique_id="b163f73c-9ac2-44d7-a037-de621f5ca828" 
+                         name="info_assets" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2003" 
+                         unique_id="bf230ee8-8f3b-44f3-b47f-cb163679e915" 
+                         name="projects_root" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2004" 
+                         unique_id="bd561651-6938-4502-9d96-b30b53774743" 
+                         name="projects_assets" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2005"
+                         parent_category_id="-2001" 
+                         unique_id="2dac9161-4642-4fe5-8453-8ec63ebc7809" 
+                         name="docs-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2006" 
+                         parent_category_id="-2005"
+                         unique_id="8544f943-1167-47c4-8e48-02a69522ea3f" 
+                         name="docs-1-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2007" 
+                         parent_category_id="-2006"
+                         unique_id="284bde5e-cdce-4727-96c2-978f187e488c" 
+                         name="docs-1-1-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2008" 
+                         parent_category_id="-2006"
+                         unique_id="b3bdd84d-034e-485d-a6fb-ae36910088a4" 
+                         name="docs-1-1-2" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2009" 
+                         parent_category_id="-2010"
+                         unique_id="aeef9f75-acc8-4f91-a5fd-b54761fef279" 
+                         name="downloads_1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2010" 
+                         parent_category_id="-2001"
+                         unique_id="88b512e1-56d0-440b-8585-035b8a91a1d1" 
+                         name="docs-2" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2011" 
+                         parent_category_id="-2010"
+                         unique_id="5bfc8ff0-b01b-4ad3-87e0-d58a0725c299" 
+                         name="docs-2-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2012" 
+                         parent_category_id="-2010"
+                         unique_id="6d73746b-a3c5-486a-b29e-471190757176" 
+                         name="downloads" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2013" 
+                         unique_id="449405b7-8e6b-4253-91af-cebdd9b2e6c3" 
+                         parent_category_id="-2002"
+                         name="assets-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2014" 
+                         unique_id="87add7f6-7208-4dc1-9612-909606039281" 
+                         parent_category_id="-2013"
+                         name="assets-1-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2015" 
+                         parent_category_id="-2013"
+                         unique_id="ca4005e2-486d-40d2-a79c-6ccec8222ea4" 
+                         name="assets-1-2" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    
+    <ccm_core.category_titles object_id="-2001" 
+                              locale="en" 
+                              localized_value="info_root" />
+    <ccm_core.category_titles object_id="-2002" 
+                              locale="en" 
+                              localized_value="info_assets" />
+    <ccm_core.category_titles object_id="-2003" 
+                              locale="en" 
+                              localized_value="projects_root" />
+    <ccm_core.category_titles object_id="-2004" 
+                              locale="en" 
+                              localized_value="projects_assets" />
+    <ccm_core.category_titles object_id="-2005" 
+                              locale="en" 
+                              localized_value="docs-1" />
+    <ccm_core.category_titles object_id="-2006" 
+                              locale="en" 
+                              localized_value="docs-1-1" />
+    <ccm_core.category_titles object_id="-2007" 
+                              locale="en" 
+                              localized_value="docs-1-1-1" />
+    <ccm_core.category_titles object_id="-2008" 
+                              locale="en" 
+                              localized_value="docs-1-1-2" />
+    <ccm_core.category_titles object_id="-2009" 
+                              locale="en" 
+                              localized_value="downloads_1" />
+    <ccm_core.category_titles object_id="-2010" 
+                              locale="en" 
+                              localized_value="docs-2" />
+    <ccm_core.category_titles object_id="-2011" 
+                              locale="en" 
+                              localized_value="docs-2-1" />
+    <ccm_core.category_titles object_id="-2012" 
+                              locale="en" 
+                              localized_value="downloads" />
+    <ccm_core.category_titles object_id="-2013" 
+                              locale="en" 
+                              localized_value="assets-1" />
+    <ccm_core.category_titles object_id="-2014" 
+                              locale="en" 
+                              localized_value="assets-1-1" />
+    <ccm_core.category_titles object_id="-2015" 
+                              locale="en" 
+                              localized_value="assets-1-2" />
+
+    <ccm_cms.folders object_id="-2001" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2002" 
+                     type="ASSETS_FOLDER"/>
+    <ccm_cms.folders object_id="-2003" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2004" 
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-2005" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2006" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2007" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2008" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2009" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2010" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2011" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2012" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2013" 
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-2014" 
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-2015" 
+                     type="ASSETS_FOLDER" />
+    
+    <ccm_core.resources object_id="-1100" 
+                        created="2016-07-15" />
+    <ccm_core.resources object_id="-1200" 
+                        created="2016-07-15" />
+    
+    <ccm_core.resource_titles object_id="-1100" 
+                              locale="en"
+                              localized_value="info" />
+    <ccm_core.resource_titles object_id="-1200" 
+                              locale="en"
+                              localized_value="projects" />
+    
+    <ccm_core.applications object_id="-1100"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="info" />
+    <ccm_core.applications object_id="-1200"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="projects" />
+    
+    <ccm_cms.content_sections object_id="-1100"
+                              label="info"
+                              root_documents_folder_id="-2001"
+                              root_assets_folder_id="-2002" />
+    <ccm_cms.content_sections object_id="-1200"
+                              label="projects"
+                              root_documents_folder_id="-2003"
+                              root_assets_folder_id="-2004" />
+    
+    <ccm_cms.folder_content_section_map folder_id="-2001" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2002" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2003" 
+                                        content_section_id="-1200" />
+    <ccm_cms.folder_content_section_map folder_id="-2004" 
+                                        content_section_id="-1200" />
+    <ccm_cms.folder_content_section_map folder_id="-2005" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2006" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2007" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2008" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2009" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2010" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2011" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2012" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2013" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2014" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2015" 
+                                        content_section_id="-1100" />
+
+    <ccm_cms.content_types object_id="-20100" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-1100" />
+    
+    <ccm_cms.content_items object_id="-3001" 
+                           item_uuid="3703e9b1-1097-42aa-9b26-56a622e8b1ad"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-3002" 
+                           item_uuid="b1953269-0b67-456b-82e9-0f01b7ff1df6"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-3003" 
+                           item_uuid="2c3b5a1b-dc00-4844-bc88-4b1e4495e4ba"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-3004" 
+                           item_uuid="2c3b5a1b-dc00-4844-bc88-4b1e4495e4ba"
+                           version="LIVE"
+                           content_type_id="-20100" />
+    
+    <ccm_cms.content_item_names object_id="-3001"
+                                locale="en"
+                                localized_value="article-1-1-1a" />
+    <ccm_cms.content_item_names object_id="-3002"
+                                locale="en"
+                                localized_value="article-1-1-1b" />
+    <ccm_cms.content_item_names object_id="-3003"
+                                locale="en"
+                                localized_value="article-2-1a" />
+    <ccm_cms.content_item_names object_id="-3004"
+                                locale="en"
+                                localized_value="article-2-1a" />
+
+    <ccm_cms.content_item_titles object_id="-3001"
+                                 locale="en"
+                                 localized_value="article-1-1-1a" />
+    <ccm_cms.content_item_titles object_id="-3002"
+                                 locale="en"
+                                 localized_value="article-1-1-1b" />
+    <ccm_cms.content_item_titles object_id="-3003"
+                                 locale="en"
+                                 localized_value="article-2-1a" />
+    <ccm_cms.content_item_titles object_id="-3004"
+                                 locale="en"
+                                 localized_value="article-2-1a" />
+
+    <ccm_cms.content_type_labels object_id="-20100"
+                                 locale="en" 
+                                 localized_value="Article" />
+
+    <ccm_cms.articles object_id="-3001" />
+    <ccm_cms.articles object_id="-3002" />
+    <ccm_cms.articles object_id="-3003" />
+    <ccm_cms.articles object_id="-3004" />
+
+    <ccm_cms.article_texts 
+        object_id="-3001"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+    <ccm_cms.article_texts 
+        object_id="-3002"
+        locale="en" 
+        localized_value="Duis quis tincidunt elit. In pharetra justo sit amet ipsum dictum, at." />
+    <ccm_cms.article_texts 
+        object_id="-3003"
+        locale="en" 
+        localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." />
+    <ccm_cms.article_texts 
+        object_id="-3004"
+        locale="en" 
+        localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." />
+
+    <ccm_core.categorizations categorization_id="-30001" 
+                              category_id="-2008" 
+                              object_id="-3001" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30002" 
+                              category_id="-2008" 
+                              object_id="-3002" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30003" 
+                              category_id="-2011" 
+                              object_id="-3003" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30004" 
+                              category_id="-2011" 
+                              object_id="-3004" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+
+</dataset>

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/FolderManagerTest/after-move-folder.xml

@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+
+    <ccm_core.ccm_objects object_id="-1100"
+                          display_name="info"
+                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
+    <ccm_core.ccm_objects object_id="-1200"
+                          display_name="projects"
+                          uuid="eb7b1eec-3df4-4a42-bffa-27c80a1a7f2f" />
+    <ccm_core.ccm_objects object_id="-20100"
+                          display_name="org.librecms.contenttypes.Article"
+                          uuid="2c8ec2fb-319d-4d44-9698-697c08b2b941" />
+    <ccm_core.ccm_objects object_id="-2001"
+                          display_name="info_root"
+                          uuid="82014239-9c06-486d-ae8c-4ae47f52a699" />
+    <ccm_core.ccm_objects object_id="-2002"
+                          display_name="info_assets"
+                          uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    <ccm_core.ccm_objects object_id="-2003"
+                          display_name="projects_root"
+                          uuid="bf230ee8-8f3b-44f3-b47f-cb163679e915" />
+    <ccm_core.ccm_objects object_id="-2004"
+                          display_name="projects_assets"
+                          uuid="bd561651-6938-4502-9d96-b30b53774743" />
+    <ccm_core.ccm_objects object_id="-2005"
+                          display_name="docs-1"
+                          uuid="2dac9161-4642-4fe5-8453-8ec63ebc7809" />
+    <ccm_core.ccm_objects object_id="-2006"
+                          display_name="docs-1-1"
+                          uuid="8544f943-1167-47c4-8e48-02a69522ea3f" />
+    <ccm_core.ccm_objects object_id="-2007"
+                          display_name="docs-1-1-1"
+                          uuid="284bde5e-cdce-4727-96c2-978f187e488c" />
+    <ccm_core.ccm_objects object_id="-2008"
+                          display_name="docs-1-1-2"
+                          uuid="b3bdd84d-034e-485d-a6fb-ae36910088a4" />
+    <ccm_core.ccm_objects object_id="-2009"
+                          display_name="downloads"
+                          uuid="aeef9f75-acc8-4f91-a5fd-b54761fef279" />
+    <ccm_core.ccm_objects object_id="-2010"
+                          display_name="docs-2"
+                          uuid="88b512e1-56d0-440b-8585-035b8a91a1d1" />
+    <ccm_core.ccm_objects object_id="-2011"
+                          display_name="docs-2-1"
+                          uuid="5bfc8ff0-b01b-4ad3-87e0-d58a0725c299" />
+    <ccm_core.ccm_objects object_id="-2012"
+                          display_name="downloads"
+                          uuid="6d73746b-a3c5-486a-b29e-471190757176" />
+    <ccm_core.ccm_objects object_id="-2013"
+                          display_name="assets-1"
+                          uuid="449405b7-8e6b-4253-91af-cebdd9b2e6c3" />
+    <ccm_core.ccm_objects object_id="-2014"
+                          display_name="assets-1-1"
+                          uuid="87add7f6-7208-4dc1-9612-909606039281" />
+    <ccm_core.ccm_objects object_id="-2015"
+                          display_name="assets-1-2"
+                          uuid="ca4005e2-486d-40d2-a79c-6ccec8222ea4" />
+    <ccm_core.ccm_objects object_id="-3001"
+                          display_name="article-1-1-1-a"
+                          uuid="3703e9b1-1097-42aa-9b26-56a622e8b1ad" />
+    <ccm_core.ccm_objects object_id="-3002"
+                          display_name="article-1-1-1-b"
+                          uuid="b1953269-0b67-456b-82e9-0f01b7ff1df6" />
+    <ccm_core.ccm_objects object_id="-3003"
+                          display_name="article-2-1-a"
+                          uuid="2c3b5a1b-dc00-4844-bc88-4b1e4495e4ba" />
+    <ccm_core.ccm_objects object_id="-3004"
+                          display_name="article-2-1-a"
+                          uuid="a1e24f4f-aca2-430b-beee-dad667cbe4b8" />
+    
+    <ccm_core.categories object_id="-2001" 
+                         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="-2002" 
+                         unique_id="b163f73c-9ac2-44d7-a037-de621f5ca828" 
+                         name="info_assets" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2003" 
+                         unique_id="bf230ee8-8f3b-44f3-b47f-cb163679e915" 
+                         name="projects_root" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2004" 
+                         unique_id="bd561651-6938-4502-9d96-b30b53774743" 
+                         name="projects_assets" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2005"
+                         parent_category_id="-2001" 
+                         unique_id="2dac9161-4642-4fe5-8453-8ec63ebc7809" 
+                         name="docs-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2006" 
+                         parent_category_id="-2005"
+                         unique_id="8544f943-1167-47c4-8e48-02a69522ea3f" 
+                         name="docs-1-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2007" 
+                         parent_category_id="-2006"
+                         unique_id="284bde5e-cdce-4727-96c2-978f187e488c" 
+                         name="docs-1-1-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2008" 
+                         parent_category_id="-2010"
+                         unique_id="b3bdd84d-034e-485d-a6fb-ae36910088a4" 
+                         name="docs-1-1-2" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2009" 
+                         parent_category_id="-2005"
+                         unique_id="aeef9f75-acc8-4f91-a5fd-b54761fef279" 
+                         name="downloads" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2010" 
+                         parent_category_id="-2001"
+                         unique_id="88b512e1-56d0-440b-8585-035b8a91a1d1" 
+                         name="docs-2" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2011" 
+                         parent_category_id="-2010"
+                         unique_id="5bfc8ff0-b01b-4ad3-87e0-d58a0725c299" 
+                         name="docs-2-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2012" 
+                         parent_category_id="-2010"
+                         unique_id="6d73746b-a3c5-486a-b29e-471190757176" 
+                         name="downloads" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2013" 
+                         unique_id="449405b7-8e6b-4253-91af-cebdd9b2e6c3" 
+                         parent_category_id="-2002"
+                         name="assets-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2014" 
+                         unique_id="87add7f6-7208-4dc1-9612-909606039281" 
+                         parent_category_id="-2013"
+                         name="assets-1-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2015" 
+                         parent_category_id="-2013"
+                         unique_id="ca4005e2-486d-40d2-a79c-6ccec8222ea4" 
+                         name="assets-1-2" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    
+    <ccm_core.category_titles object_id="-2001" 
+                              locale="en" 
+                              localized_value="info_root" />
+    <ccm_core.category_titles object_id="-2002" 
+                              locale="en" 
+                              localized_value="info_assets" />
+    <ccm_core.category_titles object_id="-2003" 
+                              locale="en" 
+                              localized_value="projects_root" />
+    <ccm_core.category_titles object_id="-2004" 
+                              locale="en" 
+                              localized_value="projects_assets" />
+    <ccm_core.category_titles object_id="-2005" 
+                              locale="en" 
+                              localized_value="docs-1" />
+    <ccm_core.category_titles object_id="-2006" 
+                              locale="en" 
+                              localized_value="docs-1-1" />
+    <ccm_core.category_titles object_id="-2007" 
+                              locale="en" 
+                              localized_value="docs-1-1-1" />
+    <ccm_core.category_titles object_id="-2008" 
+                              locale="en" 
+                              localized_value="docs-1-1-2" />
+    <ccm_core.category_titles object_id="-2009" 
+                              locale="en" 
+                              localized_value="downloads" />
+    <ccm_core.category_titles object_id="-2010" 
+                              locale="en" 
+                              localized_value="docs-2" />
+    <ccm_core.category_titles object_id="-2011" 
+                              locale="en" 
+                              localized_value="docs-2-1" />
+    <ccm_core.category_titles object_id="-2012" 
+                              locale="en" 
+                              localized_value="downloads" />
+    <ccm_core.category_titles object_id="-2013" 
+                              locale="en" 
+                              localized_value="assets-1" />
+    <ccm_core.category_titles object_id="-2014" 
+                              locale="en" 
+                              localized_value="assets-1-1" />
+    <ccm_core.category_titles object_id="-2015" 
+                              locale="en" 
+                              localized_value="assets-1-2" />
+
+    <ccm_cms.folders object_id="-2001" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2002" 
+                     type="ASSETS_FOLDER"/>
+    <ccm_cms.folders object_id="-2003" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2004" 
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-2005" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2006" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2007" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2008" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2009" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2010" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2011" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2012" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2013" 
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-2014" 
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-2015" 
+                     type="ASSETS_FOLDER" />
+    
+    <ccm_core.resources object_id="-1100" 
+                        created="2016-07-15" />
+    <ccm_core.resources object_id="-1200" 
+                        created="2016-07-15" />
+    
+    <ccm_core.resource_titles object_id="-1100" 
+                              locale="en"
+                              localized_value="info" />
+    <ccm_core.resource_titles object_id="-1200" 
+                              locale="en"
+                              localized_value="projects" />
+    
+    <ccm_core.applications object_id="-1100"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="info" />
+    <ccm_core.applications object_id="-1200"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="projects" />
+    
+    <ccm_cms.content_sections object_id="-1100"
+                              label="info"
+                              root_documents_folder_id="-2001"
+                              root_assets_folder_id="-2002" />
+    <ccm_cms.content_sections object_id="-1200"
+                              label="projects"
+                              root_documents_folder_id="-2003"
+                              root_assets_folder_id="-2004" />
+    
+    <ccm_cms.folder_content_section_map folder_id="-2001" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2002" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2003" 
+                                        content_section_id="-1200" />
+    <ccm_cms.folder_content_section_map folder_id="-2004" 
+                                        content_section_id="-1200" />
+    <ccm_cms.folder_content_section_map folder_id="-2005" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2006" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2007" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2008" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2009" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2010" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2011" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2012" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2013" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2014" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2015" 
+                                        content_section_id="-1100" />
+
+    <ccm_cms.content_types object_id="-20100" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-1100" />
+    
+    <ccm_cms.content_items object_id="-3001" 
+                           item_uuid="3703e9b1-1097-42aa-9b26-56a622e8b1ad"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-3002" 
+                           item_uuid="b1953269-0b67-456b-82e9-0f01b7ff1df6"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-3003" 
+                           item_uuid="2c3b5a1b-dc00-4844-bc88-4b1e4495e4ba"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-3004" 
+                           item_uuid="2c3b5a1b-dc00-4844-bc88-4b1e4495e4ba"
+                           version="LIVE"
+                           content_type_id="-20100" />
+    
+    <ccm_cms.content_item_names object_id="-3001"
+                                locale="en"
+                                localized_value="article-1-1-1a" />
+    <ccm_cms.content_item_names object_id="-3002"
+                                locale="en"
+                                localized_value="article-1-1-1b" />
+    <ccm_cms.content_item_names object_id="-3003"
+                                locale="en"
+                                localized_value="article-2-1a" />
+    <ccm_cms.content_item_names object_id="-3004"
+                                locale="en"
+                                localized_value="article-2-1a" />
+
+    <ccm_cms.content_item_titles object_id="-3001"
+                                 locale="en"
+                                 localized_value="article-1-1-1a" />
+    <ccm_cms.content_item_titles object_id="-3002"
+                                 locale="en"
+                                 localized_value="article-1-1-1b" />
+    <ccm_cms.content_item_titles object_id="-3003"
+                                 locale="en"
+                                 localized_value="article-2-1a" />
+    <ccm_cms.content_item_titles object_id="-3004"
+                                 locale="en"
+                                 localized_value="article-2-1a" />
+
+    <ccm_cms.content_type_labels object_id="-20100"
+                                 locale="en" 
+                                 localized_value="Article" />
+
+    <ccm_cms.articles object_id="-3001" />
+    <ccm_cms.articles object_id="-3002" />
+    <ccm_cms.articles object_id="-3003" />
+    <ccm_cms.articles object_id="-3004" />
+
+    <ccm_cms.article_texts 
+        object_id="-3001"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+    <ccm_cms.article_texts 
+        object_id="-3002"
+        locale="en" 
+        localized_value="Duis quis tincidunt elit. In pharetra justo sit amet ipsum dictum, at." />
+    <ccm_cms.article_texts 
+        object_id="-3003"
+        locale="en" 
+        localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." />
+    <ccm_cms.article_texts 
+        object_id="-3004"
+        locale="en" 
+        localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." />
+
+    <ccm_core.categorizations categorization_id="-30001" 
+                              category_id="-2008" 
+                              object_id="-3001" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30002" 
+                              category_id="-2008" 
+                              object_id="-3002" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30003" 
+                              category_id="-2011" 
+                              object_id="-3003" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30004" 
+                              category_id="-2011" 
+                              object_id="-3004" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+
+</dataset>

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

@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+
+    <ccm_core.ccm_objects object_id="-1100"
+                          display_name="info"
+                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
+    <ccm_core.ccm_objects object_id="-1200"
+                          display_name="projects"
+                          uuid="eb7b1eec-3df4-4a42-bffa-27c80a1a7f2f" />
+    <ccm_core.ccm_objects object_id="-20100"
+                          display_name="org.librecms.contenttypes.Article"
+                          uuid="2c8ec2fb-319d-4d44-9698-697c08b2b941" />
+    <ccm_core.ccm_objects object_id="-2001"
+                          display_name="info_root"
+                          uuid="82014239-9c06-486d-ae8c-4ae47f52a699" />
+    <ccm_core.ccm_objects object_id="-2002"
+                          display_name="info_assets"
+                          uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    <ccm_core.ccm_objects object_id="-2003"
+                          display_name="projects_root"
+                          uuid="bf230ee8-8f3b-44f3-b47f-cb163679e915" />
+    <ccm_core.ccm_objects object_id="-2004"
+                          display_name="projects_assets"
+                          uuid="bd561651-6938-4502-9d96-b30b53774743" />
+    <ccm_core.ccm_objects object_id="-2005"
+                          display_name="docs-1"
+                          uuid="2dac9161-4642-4fe5-8453-8ec63ebc7809" />
+    <ccm_core.ccm_objects object_id="-2006"
+                          display_name="docs-1-1"
+                          uuid="8544f943-1167-47c4-8e48-02a69522ea3f" />
+    <ccm_core.ccm_objects object_id="-2007"
+                          display_name="docs-1-1-1"
+                          uuid="284bde5e-cdce-4727-96c2-978f187e488c" />
+    <ccm_core.ccm_objects object_id="-2008"
+                          display_name="docs-1-1-2"
+                          uuid="b3bdd84d-034e-485d-a6fb-ae36910088a4" />
+    <ccm_core.ccm_objects object_id="-2009"
+                          display_name="downloads"
+                          uuid="aeef9f75-acc8-4f91-a5fd-b54761fef279" />
+    <ccm_core.ccm_objects object_id="-2010"
+                          display_name="docs-2"
+                          uuid="88b512e1-56d0-440b-8585-035b8a91a1d1" />
+    <ccm_core.ccm_objects object_id="-2011"
+                          display_name="docs-2-1"
+                          uuid="5bfc8ff0-b01b-4ad3-87e0-d58a0725c299" />
+    <ccm_core.ccm_objects object_id="-2012"
+                          display_name="downloads"
+                          uuid="6d73746b-a3c5-486a-b29e-471190757176" />
+    <ccm_core.ccm_objects object_id="-2013"
+                          display_name="assets-1"
+                          uuid="449405b7-8e6b-4253-91af-cebdd9b2e6c3" />
+    <ccm_core.ccm_objects object_id="-2014"
+                          display_name="assets-1-1"
+                          uuid="87add7f6-7208-4dc1-9612-909606039281" />
+    <ccm_core.ccm_objects object_id="-2015"
+                          display_name="assets-1-2"
+                          uuid="ca4005e2-486d-40d2-a79c-6ccec8222ea4" />
+    <ccm_core.ccm_objects object_id="-3001"
+                          display_name="article-1-1-1-a"
+                          uuid="3703e9b1-1097-42aa-9b26-56a622e8b1ad" />
+    <ccm_core.ccm_objects object_id="-3002"
+                          display_name="article-1-1-1-b"
+                          uuid="b1953269-0b67-456b-82e9-0f01b7ff1df6" />
+    <ccm_core.ccm_objects object_id="-3003"
+                          display_name="article-2-1-a"
+                          uuid="2c3b5a1b-dc00-4844-bc88-4b1e4495e4ba" />
+    <ccm_core.ccm_objects object_id="-3004"
+                          display_name="article-2-1-a"
+                          uuid="a1e24f4f-aca2-430b-beee-dad667cbe4b8" />
+    
+    <ccm_core.categories object_id="-2001" 
+                         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="-2002" 
+                         unique_id="b163f73c-9ac2-44d7-a037-de621f5ca828" 
+                         name="info_assets" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2003" 
+                         unique_id="bf230ee8-8f3b-44f3-b47f-cb163679e915" 
+                         name="projects_root" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2004" 
+                         unique_id="bd561651-6938-4502-9d96-b30b53774743" 
+                         name="projects_assets" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2005"
+                         parent_category_id="-2001" 
+                         unique_id="2dac9161-4642-4fe5-8453-8ec63ebc7809" 
+                         name="docs-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2006" 
+                         parent_category_id="-2005"
+                         unique_id="8544f943-1167-47c4-8e48-02a69522ea3f" 
+                         name="docs-1-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2007" 
+                         parent_category_id="-2006"
+                         unique_id="284bde5e-cdce-4727-96c2-978f187e488c" 
+                         name="docs-1-1-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2008" 
+                         parent_category_id="-2006"
+                         unique_id="b3bdd84d-034e-485d-a6fb-ae36910088a4" 
+                         name="docs-1-1-2" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2009" 
+                         parent_category_id="-2005"
+                         unique_id="aeef9f75-acc8-4f91-a5fd-b54761fef279" 
+                         name="downloads" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2010" 
+                         parent_category_id="-2001"
+                         unique_id="88b512e1-56d0-440b-8585-035b8a91a1d1" 
+                         name="docs-2" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2011" 
+                         parent_category_id="-2010"
+                         unique_id="5bfc8ff0-b01b-4ad3-87e0-d58a0725c299" 
+                         name="docs-2-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2012" 
+                         parent_category_id="-2010"
+                         unique_id="6d73746b-a3c5-486a-b29e-471190757176" 
+                         name="downloads" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2013" 
+                         unique_id="449405b7-8e6b-4253-91af-cebdd9b2e6c3" 
+                         parent_category_id="-2002"
+                         name="assets-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2014" 
+                         unique_id="87add7f6-7208-4dc1-9612-909606039281" 
+                         parent_category_id="-2013"
+                         name="assets-1-1" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    <ccm_core.categories object_id="-2015" 
+                         parent_category_id="-2013"
+                         unique_id="ca4005e2-486d-40d2-a79c-6ccec8222ea4" 
+                         name="assets-1-2" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1" />
+    
+    <ccm_core.category_titles object_id="-2001" 
+                              locale="en" 
+                              localized_value="info_root" />
+    <ccm_core.category_titles object_id="-2002" 
+                              locale="en" 
+                              localized_value="info_assets" />
+    <ccm_core.category_titles object_id="-2003" 
+                              locale="en" 
+                              localized_value="projects_root" />
+    <ccm_core.category_titles object_id="-2004" 
+                              locale="en" 
+                              localized_value="projects_assets" />
+    <ccm_core.category_titles object_id="-2005" 
+                              locale="en" 
+                              localized_value="docs-1" />
+    <ccm_core.category_titles object_id="-2006" 
+                              locale="en" 
+                              localized_value="docs-1-1" />
+    <ccm_core.category_titles object_id="-2007" 
+                              locale="en" 
+                              localized_value="docs-1-1-1" />
+    <ccm_core.category_titles object_id="-2008" 
+                              locale="en" 
+                              localized_value="docs-1-1-2" />
+    <ccm_core.category_titles object_id="-2009" 
+                              locale="en" 
+                              localized_value="downloads" />
+    <ccm_core.category_titles object_id="-2010" 
+                              locale="en" 
+                              localized_value="docs-2" />
+    <ccm_core.category_titles object_id="-2011" 
+                              locale="en" 
+                              localized_value="docs-2-1" />
+    <ccm_core.category_titles object_id="-2012" 
+                              locale="en" 
+                              localized_value="downloads" />
+    <ccm_core.category_titles object_id="-2013" 
+                              locale="en" 
+                              localized_value="assets-1" />
+    <ccm_core.category_titles object_id="-2014" 
+                              locale="en" 
+                              localized_value="assets-1-1" />
+    <ccm_core.category_titles object_id="-2015" 
+                              locale="en" 
+                              localized_value="assets-1-2" />
+
+    <ccm_cms.folders object_id="-2001" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2002" 
+                     type="ASSETS_FOLDER"/>
+    <ccm_cms.folders object_id="-2003" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2004" 
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-2005" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2006" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2007" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2008" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2009" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2010" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2011" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2012" 
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-2013" 
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-2014" 
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-2015" 
+                     type="ASSETS_FOLDER" />
+    
+    <ccm_core.resources object_id="-1100" 
+                        created="2016-07-15" />
+    <ccm_core.resources object_id="-1200" 
+                        created="2016-07-15" />
+    
+    <ccm_core.resource_titles object_id="-1100" 
+                              locale="en"
+                              localized_value="info" />
+    <ccm_core.resource_titles object_id="-1200" 
+                              locale="en"
+                              localized_value="projects" />
+    
+    <ccm_core.applications object_id="-1100"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="info" />
+    <ccm_core.applications object_id="-1200"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="projects" />
+    
+    <ccm_cms.content_sections object_id="-1100"
+                              label="info"
+                              root_documents_folder_id="-2001"
+                              root_assets_folder_id="-2002" />
+    <ccm_cms.content_sections object_id="-1200"
+                              label="projects"
+                              root_documents_folder_id="-2003"
+                              root_assets_folder_id="-2004" />
+    
+    <ccm_cms.folder_content_section_map folder_id="-2001" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2002" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2003" 
+                                        content_section_id="-1200" />
+    <ccm_cms.folder_content_section_map folder_id="-2004" 
+                                        content_section_id="-1200" />
+    <ccm_cms.folder_content_section_map folder_id="-2005" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2006" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2007" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2008" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2009" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2010" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2011" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2012" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2013" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2014" 
+                                        content_section_id="-1100" />
+    <ccm_cms.folder_content_section_map folder_id="-2015" 
+                                        content_section_id="-1100" />
+
+    <ccm_cms.content_types object_id="-20100" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-1100" />
+    
+    <ccm_cms.content_items object_id="-3001" 
+                           item_uuid="3703e9b1-1097-42aa-9b26-56a622e8b1ad"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-3002" 
+                           item_uuid="b1953269-0b67-456b-82e9-0f01b7ff1df6"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-3003" 
+                           item_uuid="2c3b5a1b-dc00-4844-bc88-4b1e4495e4ba"
+                           version="DRAFT"
+                           content_type_id="-20100" />
+    <ccm_cms.content_items object_id="-3004" 
+                           item_uuid="2c3b5a1b-dc00-4844-bc88-4b1e4495e4ba"
+                           version="LIVE"
+                           content_type_id="-20100" />
+    
+    <ccm_cms.content_item_names object_id="-3001"
+                                locale="en"
+                                localized_value="article-1-1-1a" />
+    <ccm_cms.content_item_names object_id="-3002"
+                                locale="en"
+                                localized_value="article-1-1-1b" />
+    <ccm_cms.content_item_names object_id="-3003"
+                                locale="en"
+                                localized_value="article-2-1a" />
+    <ccm_cms.content_item_names object_id="-3004"
+                                locale="en"
+                                localized_value="article-2-1a" />
+
+    <ccm_cms.content_item_titles object_id="-3001"
+                                 locale="en"
+                                 localized_value="article-1-1-1a" />
+    <ccm_cms.content_item_titles object_id="-3002"
+                                 locale="en"
+                                 localized_value="article-1-1-1b" />
+    <ccm_cms.content_item_titles object_id="-3003"
+                                 locale="en"
+                                 localized_value="article-2-1a" />
+    <ccm_cms.content_item_titles object_id="-3004"
+                                 locale="en"
+                                 localized_value="article-2-1a" />
+
+    <ccm_cms.content_type_labels object_id="-20100"
+                                 locale="en" 
+                                 localized_value="Article" />
+
+    <ccm_cms.articles object_id="-3001" />
+    <ccm_cms.articles object_id="-3002" />
+    <ccm_cms.articles object_id="-3003" />
+    <ccm_cms.articles object_id="-3004" />
+
+    <ccm_cms.article_texts 
+        object_id="-3001"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+    <ccm_cms.article_texts 
+        object_id="-3002"
+        locale="en" 
+        localized_value="Duis quis tincidunt elit. In pharetra justo sit amet ipsum dictum, at." />
+    <ccm_cms.article_texts 
+        object_id="-3003"
+        locale="en" 
+        localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." />
+    <ccm_cms.article_texts 
+        object_id="-3004"
+        locale="en" 
+        localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." />
+
+    <ccm_core.categorizations categorization_id="-30001" 
+                              category_id="-2008" 
+                              object_id="-3001" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30002" 
+                              category_id="-2008" 
+                              object_id="-3002" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30003" 
+                              category_id="-2011" 
+                              object_id="-3003" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30004" 
+                              category_id="-2011" 
+                              object_id="-3004" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+
+</dataset>

ccm-cms/src/test/resources/scripts/h2-cleanup.sql

@@ -72,10 +72,14 @@ DELETE FROM ccm_cms.lifecycle_phase_definitions;
 
 DELETE FROM ccm_cms.lifecyle_definitions;
 
+DELETE FROM ccm_cms.folder_content_section_map;
+
 DELETE FROM ccm_cms.content_section_roles;
 
 DELETE FROM ccm_cms.content_sections;
 
+DELETE FROM ccm_cms.folders;
+
 DELETE FROM ccm_core.settings_string_list;
 
 DELETE FROM ccm_core.settings_l10n_str_values;

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

@@ -218,7 +218,10 @@ public class Resource extends CcmObject implements Serializable {
         if (!Objects.equals(description, other.getDescription())) {
             return false;
         }
-        if (!Objects.equals(created, other.getCreated())) {
+        //Note: Objects.equals(created, other.getCreated() returns false even
+        //if the dates are true because Hibernate sets the value with a sub 
+        //class of date. Solved by using getCreated()...
+        if (!Objects.equals(getCreated(), other.getCreated())) {
             return false;
         }
         return Objects.equals(parent, other.getParent());