CCM NG/ccm-cms: Tests and implementations for some methods of the AssetManager

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

ccm-cms/src/main/java/com/arsdigita/cms/ui/category/AddUseContextForm.java

@@ -131,9 +131,9 @@ class AddUseContextForm extends BaseForm {
                 }
 
             }*/
-            m_model.setSelectedKey(state, useContext == null ? 
+//            m_model.setSelectedKey(state, useContext == null ? 
-                                   CategoryUseContextModelBuilder.DEFAULT_USE_CONTEXT :
+//                                   CategoryUseContextModelBuilder.DEFAULT_USE_CONTEXT :
-                                   useContext);
+//                                   useContext);
         }
     }
 }

ccm-cms/src/main/java/org/librecms/assets/AssetManager.java

@@ -18,8 +18,11 @@
  */
 package org.librecms.assets;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
@@ -28,6 +31,8 @@ import javax.transaction.Transactional;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.libreccm.categorization.Categorization;
+import org.libreccm.categorization.Category;
 import org.libreccm.categorization.CategoryManager;
 import org.libreccm.core.CoreConstants;
 import org.libreccm.security.AuthorizationRequired;
@@ -40,6 +45,8 @@ import org.librecms.contentsection.FolderRepository;
 import org.librecms.contentsection.privileges.AssetPrivileges;
 import org.librecms.contentsection.privileges.ItemPrivileges;
 
+import static org.librecms.CmsConstants.*;
+
 /**
  * Provides methods for managing {@link Asset}s, especially sharable
  * {@link Asset}.
@@ -195,7 +202,7 @@ public class AssetManager {
      */
     @Transactional(Transactional.TxType.REQUIRED)
     public boolean isAssetInUse(final Asset asset) {
-        throw new UnsupportedOperationException("Not implemented yet.");
+        return !asset.getItemAttachments().isEmpty();
     }
 
     /**
@@ -210,7 +217,7 @@ public class AssetManager {
      * @see #getAssetPath(org.librecms.assets.Asset, boolean)
      */
     public String getAssetPath(final Asset asset) {
-        throw new UnsupportedOperationException("Not implemented yet.");
+        return getAssetPath(asset, false);
     }
 
     /**
@@ -219,20 +226,52 @@ public class AssetManager {
      * @param asset The {@link Asset} for which the path is generated.
      * @param withContentSection Whether to include the content section into the
      * path or not.
-     * @return The path of the asset.
+     * @return The path of the asset. For non shared assets this is an empty
+     * string.
      *
      * @see #getAssetPath(org.librecms.assets.Asset)
      */
     public String getAssetPath(final Asset asset,
                                final boolean withContentSection) {
-        throw new UnsupportedOperationException("Not implemented yet.");
+        final List<Categorization> result = asset.getCategories().stream()
+                .filter(categorization -> {
+                    return CATEGORIZATION_TYPE_FOLDER.equals(
+                            categorization.getType());
+                })
+                .collect(Collectors.toList());
+
+        if (result.isEmpty()) {
+            return "";
+        } else {
+            final List<String> tokens = new ArrayList<>();
+            tokens.add(asset.getDisplayName());
+
+            Category current = result.get(0).getCategory();
+            tokens.add(current.getName());
+            while (current.getParentCategory() != null) {
+                current = current.getParentCategory();
+                tokens.add(current.getName());
+            }
+
+            Collections.reverse(tokens);
+            final String path = String.join("/", tokens);
+
+            if (withContentSection) {
+                final String sectionName = ((Folder) result.get(0).getCategory()).
+                        getSection().getDisplayName();
+                return String.format("%s:/%s", sectionName, path);
+            } else {
+                return String.format("/%s", path);
+            }
+        }
     }
 
     /**
      * Creates a list of the folder in which an asset is placed.
      *
      * @param asset
-     * @return
+     * @return A list of the folders which form the path of the asset. For non
+     * shared assets an empty list is returned.
      */
     public List<Folder> getAssetFolders(final Asset asset) {
         throw new UnsupportedOperationException("Not implemented yet.");
@@ -246,6 +285,14 @@ public class AssetManager {
      * shared asset an empty {@link Optional} is returned.
      */
     public Optional<Folder> getAssetFolder(final Asset asset) {
-        throw new UnsupportedOperationException("Not implemented yet.");
+        return asset.getCategories().stream()
+                .filter(categorization -> {
+                    return CATEGORIZATION_TYPE_FOLDER.equals(
+                            categorization.getType());
+                })
+                .map(categorization -> {
+                    return (Folder) categorization.getCategory();
+                })
+                .findFirst();
     }
 }

ccm-cms/src/test/java/org/librecms/assets/AssetManagerTest.java

@@ -18,6 +18,9 @@
  */
 package org.librecms.assets;
 
+import java.util.List;
+import java.util.Optional;
+
 import static org.libreccm.testutils.DependenciesHelpers.*;
 
 import org.jboss.arquillian.container.test.api.Deployment;
@@ -45,6 +48,7 @@ import org.librecms.attachments.AttachmentList;
 import org.librecms.contentsection.FolderRepository;
 
 import javax.inject.Inject;
+import org.librecms.contentsection.Folder;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -95,61 +99,61 @@ public class AssetManagerTest {
     @Deployment
     public static WebArchive createDeployment() {
         return ShrinkWrap
-            .create(WebArchive.class,
+                .create(WebArchive.class,
-                    "LibreCCM-org.librecms.assets.AssetManagerTest.war")
+                        "LibreCCM-org.librecms.assets.AssetManagerTest.war")
-            .addPackage(org.libreccm.auditing.CcmRevision.class.getPackage())
+                .addPackage(org.libreccm.auditing.CcmRevision.class.getPackage()).
-            .addPackage(org.libreccm.categorization.Categorization.class
+                addPackage(org.libreccm.categorization.Categorization.class
-                .getPackage())
+                        .getPackage())
-            .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage())
+                .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage())
-            .addPackage(org.libreccm.configuration.Configuration.class
+                .addPackage(org.libreccm.configuration.Configuration.class
-                .getPackage())
+                        .getPackage())
-            .addPackage(org.libreccm.core.CcmCore.class.getPackage())
+                .addPackage(org.libreccm.core.CcmCore.class.getPackage())
-            .addPackage(org.libreccm.jpa.EntityManagerProducer.class
+                .addPackage(org.libreccm.jpa.EntityManagerProducer.class
-                .getPackage())
+                        .getPackage())
-            .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class
+                .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class
-                .getPackage())
+                        .getPackage())
-            .addPackage(org.libreccm.l10n.LocalizedString.class
+                .addPackage(org.libreccm.l10n.LocalizedString.class
-                .getPackage())
+                        .getPackage())
-            .addPackage(org.libreccm.security.Permission.class.getPackage())
+                .addPackage(org.libreccm.security.Permission.class.getPackage())
-            .addPackage(org.libreccm.web.CcmApplication.class.getPackage())
+                .addPackage(org.libreccm.web.CcmApplication.class.getPackage())
-            .addPackage(org.libreccm.workflow.Workflow.class.getPackage())
+                .addPackage(org.libreccm.workflow.Workflow.class.getPackage())
-            .addPackage(com.arsdigita.bebop.Component.class.getPackage())
+                .addPackage(com.arsdigita.bebop.Component.class.getPackage())
-            .addPackage(com.arsdigita.bebop.util.BebopConstants.class
+                .addPackage(com.arsdigita.bebop.util.BebopConstants.class
-                .getPackage())
+                        .getPackage())
-            .addClass(com.arsdigita.kernel.KernelConfig.class)
+                .addClass(com.arsdigita.kernel.KernelConfig.class)
-            .addClass(com.arsdigita.runtime.CCMResourceManager.class)
+                .addClass(com.arsdigita.runtime.CCMResourceManager.class)
-            .addClass(
+                .addClass(
-                com.arsdigita.ui.admin.applications.AbstractAppInstanceForm.class)
+                        com.arsdigita.ui.admin.applications.AbstractAppInstanceForm.class).
-            .addClass(
+                addClass(
-                com.arsdigita.ui.admin.applications.AbstractAppSettingsPane.class)
+                        com.arsdigita.ui.admin.applications.AbstractAppSettingsPane.class).
-            .addClass(
+                addClass(
-                com.arsdigita.ui.admin.applications.DefaultApplicationInstanceForm.class)
+                        com.arsdigita.ui.admin.applications.DefaultApplicationInstanceForm.class).
-            .addClass(
+                addClass(
-                com.arsdigita.ui.admin.applications.DefaultApplicationSettingsPane.class)
+                        com.arsdigita.ui.admin.applications.DefaultApplicationSettingsPane.class).
-            .addClass(com.arsdigita.cms.dispatcher.ItemResolver.class)
+                addClass(com.arsdigita.cms.dispatcher.ItemResolver.class)
-            .addPackage(com.arsdigita.util.Lockable.class.getPackage())
+                .addPackage(com.arsdigita.util.Lockable.class.getPackage())
-            .addPackage(com.arsdigita.web.BaseServlet.class.getPackage())
+                .addPackage(com.arsdigita.web.BaseServlet.class.getPackage())
-            .addPackage(org.librecms.Cms.class.getPackage())
+                .addPackage(org.librecms.Cms.class.getPackage())
-            .addPackage(org.librecms.assets.Asset.class.getPackage())
+                .addPackage(org.librecms.assets.Asset.class.getPackage())
-            .addPackage(org.librecms.attachments.AttachmentList.class
+                .addPackage(org.librecms.attachments.AttachmentList.class
-                .getPackage())
+                        .getPackage())
-            .addPackage(org.librecms.lifecycle.Lifecycle.class.getPackage())
+                .addPackage(org.librecms.lifecycle.Lifecycle.class.getPackage())
-            .addPackage(org.librecms.contentsection.ContentSection.class
+                .addPackage(org.librecms.contentsection.ContentSection.class
-                .getPackage())
+                        .getPackage())
-            .addPackage(org.librecms.contenttypes.Article.class.getPackage()).
+                .addPackage(org.librecms.contenttypes.Article.class.getPackage()).
-            addClass(com.arsdigita.kernel.security.SecurityConfig.class)
+                addClass(com.arsdigita.kernel.security.SecurityConfig.class)
-            .addPackage(org.libreccm.tests.categories.IntegrationTest.class
+                .addPackage(org.libreccm.tests.categories.IntegrationTest.class
-                .getPackage())
+                        .getPackage())
-            //            .addAsLibraries(getModuleDependencies())
+                //            .addAsLibraries(getModuleDependencies())
-            .addAsLibraries(getCcmCoreDependencies())
+                .addAsLibraries(getCcmCoreDependencies())
-            .addAsResource("configs/shiro.ini", "shiro.ini")
+                .addAsResource("configs/shiro.ini", "shiro.ini")
-            .addAsResource(
+                .addAsResource(
-                "configs/org/librecms/contentsection/ContentItemManagerTest/log4j2.xml",
+                        "configs/org/librecms/contentsection/ContentItemManagerTest/log4j2.xml",
-                "log4j2.xml")
+                        "log4j2.xml")
-            .addAsResource("test-persistence.xml",
+                .addAsResource("test-persistence.xml",
-                           "META-INF/persistence.xml")
+                               "META-INF/persistence.xml")
-            .addAsWebInfResource("test-web.xml", "web.xml")
+                .addAsWebInfResource("test-web.xml", "web.xml")
-            .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml");
+                .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml");
     }
 
     /**
@@ -184,10 +188,10 @@ public class AssetManagerTest {
     @InSequence(100)
     @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
     @ShouldMatchDataSet(
-        value = "datasets/org/librecms/assets/AssetManagerTest/"
+            value = "datasets/org/librecms/assets/AssetManagerTest/"
-                    + "after-create-nonshared.xml",
+                            + "after-create-nonshared.xml",
-        excludeColumns = {"object_id",
+            excludeColumns = {"object_id",
-                          "uuid"})
+                              "uuid"})
     public void createNonSharedAssets() {
         fail();
     }
@@ -260,10 +264,10 @@ public class AssetManagerTest {
     @InSequence(200)
     @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
     @ShouldMatchDataSet(
-        value = "datasets/org/librecms/assets/AssetManagerTest/"
+            value = "datasets/org/librecms/assets/AssetManagerTest/"
-                    + "after-create-shared.xml",
+                            + "after-create-shared.xml",
-        excludeColumns = {"object_id",
+            excludeColumns = {"object_id",
-                          "uuid"})
+                              "uuid"})
     public void createSharedAssets() {
         fail();
     }
@@ -336,10 +340,10 @@ public class AssetManagerTest {
     @InSequence(300)
     @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
     @ShouldMatchDataSet(
-        value = "datasets/org/librecms/assets/AssetManagerTest/"
+            value = "datasets/org/librecms/assets/AssetManagerTest/"
-                    + "after-clean-orphaned.xml",
+                            + "after-clean-orphaned.xml",
-        excludeColumns = {"object_id",
+            excludeColumns = {"object_id",
-                          "uuid"})
+                              "uuid"})
     public void cleanOrphanedAssets() {
         fail();
     }
@@ -352,10 +356,10 @@ public class AssetManagerTest {
     @InSequence(400)
     @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
     @ShouldMatchDataSet(
-        value = "datasets/org/librecms/assets/AssetManagerTest/"
+            value = "datasets/org/librecms/assets/AssetManagerTest/"
-                    + "after-move-to-other-folder.xml",
+                            + "after-move-to-other-folder.xml",
-        excludeColumns = {"object_id",
+            excludeColumns = {"object_id",
-                          "uuid"})
+                              "uuid"})
     public void moveAssetToOtherFolder() {
         fail();
     }
@@ -368,10 +372,10 @@ public class AssetManagerTest {
     @InSequence(410)
     @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
     @ShouldMatchDataSet(
-        value = "datasets/org/librecms/assets/AssetManagerTest/"
+            value = "datasets/org/librecms/assets/AssetManagerTest/"
-                    + "after-move-to-other-contentsection.xml",
+                            + "after-move-to-other-contentsection.xml",
-        excludeColumns = {"object_id",
+            excludeColumns = {"object_id",
-                          "uuid"})
+                              "uuid"})
     public void moveAssetToFolderInOtherContentSection() {
         fail();
     }
@@ -429,10 +433,10 @@ public class AssetManagerTest {
     @InSequence(500)
     @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
     @ShouldMatchDataSet(
-        value = "datasets/org/librecms/assets/AssetManagerTest/"
+            value = "datasets/org/librecms/assets/AssetManagerTest/"
-                    + "after-copy-to-other-folder.xml",
+                            + "after-copy-to-other-folder.xml",
-        excludeColumns = {"object_id",
+            excludeColumns = {"object_id",
-                          "uuid"})
+                              "uuid"})
     public void copyAssetToOtherFolder() {
         fail();
     }
@@ -445,10 +449,10 @@ public class AssetManagerTest {
     @InSequence(510)
     @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
     @ShouldMatchDataSet(
-        value = "datasets/org/librecms/assets/AssetManagerTest/"
+            value = "datasets/org/librecms/assets/AssetManagerTest/"
-                    + "after-copy-to-same-folder.xml",
+                            + "after-copy-to-same-folder.xml",
-        excludeColumns = {"object_id",
+            excludeColumns = {"object_id",
-                          "uuid"})
+                              "uuid"})
     public void copyAssetToSameFolder() {
         fail();
     }
@@ -462,10 +466,10 @@ public class AssetManagerTest {
     @InSequence(520)
     @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
     @ShouldMatchDataSet(
-        value = "datasets/org/librecms/assets/AssetManagerTest/"
+            value = "datasets/org/librecms/assets/AssetManagerTest/"
-                    + "after-copy-to-other-contentsection.xml",
+                            + "after-copy-to-other-contentsection.xml",
-        excludeColumns = {"object_id",
+            excludeColumns = {"object_id",
-                          "uuid"})
+                              "uuid"})
     public void copyAssetToOtherContentSection() {
         fail();
     }
@@ -520,11 +524,28 @@ public class AssetManagerTest {
      * {@link AssetManager#isAssetInUse(org.librecms.assets.Asset)} for various
      * {@link Asset}s.
      */
+    @Test
     @InSequence(600)
     @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
     @ShouldMatchDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
     public void verifyIsAssetInUse() {
-        fail();
+        final Asset header = assetRepo.findById(-700L);
+        final Asset phb = assetRepo.findById(-800L);
+        final Asset servicesHeader = assetRepo.findById(-900L);
+        final Asset product1Datasheet = assetRepo.findById(-1000L);
+        final Asset catalog = assetRepo.findById(-1100L);
+
+        assertThat(header, is(not(nullValue())));
+        assertThat(phb, is(not(nullValue())));
+        assertThat(servicesHeader, is(not(nullValue())));
+        assertThat(product1Datasheet, is(not(nullValue())));
+        assertThat(catalog, is(not(nullValue())));
+
+        assertThat(assetManager.isAssetInUse(header), is(true));
+        assertThat(assetManager.isAssetInUse(phb), is(false));
+        assertThat(assetManager.isAssetInUse(servicesHeader), is(true));
+        assertThat(assetManager.isAssetInUse(product1Datasheet), is(true));
+        assertThat(assetManager.isAssetInUse(catalog), is(true));
     }
 
     /**
@@ -532,11 +553,33 @@ public class AssetManagerTest {
      * {@link AssetManager#getAssetPath(org.librecms.assets.Asset)} for various
      * {@link Asset}s.
      */
+    @Test
     @InSequence(700)
     @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
     @ShouldMatchDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
     public void verifyGetAssetPathWithoutContentSection() {
-        fail();
+        final Asset header = assetRepo.findById(-700L);
+        final Asset phb = assetRepo.findById(-800L);
+        final Asset servicesHeader = assetRepo.findById(-900L);
+        final Asset product1Datasheet = assetRepo.findById(-1000L);
+        final Asset catalog = assetRepo.findById(-1100L);
+
+        assertThat(header, is(not(nullValue())));
+        assertThat(phb, is(not(nullValue())));
+        assertThat(servicesHeader, is(not(nullValue())));
+        assertThat(product1Datasheet, is(not(nullValue())));
+        assertThat(catalog, is(not(nullValue())));
+
+        assertThat(assetManager.getAssetPath(header),
+                   is(equalTo("/media/header.png")));
+        assertThat(assetManager.getAssetPath(phb),
+                   is(equalTo("/media/the-phb.png")));
+        assertThat(assetManager.getAssetPath(servicesHeader),
+                   is(equalTo("/media/services-header.png")));
+        assertThat(assetManager.getAssetPath(product1Datasheet),
+                   is(equalTo("")));
+        assertThat(assetManager.getAssetPath(catalog),
+                   is(equalTo("/media/catalog.pdf")));
     }
 
     /**
@@ -544,11 +587,33 @@ public class AssetManagerTest {
      * }
      * for various {@link Asset}s.
      */
+    @Test
     @InSequence(800)
     @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
     @ShouldMatchDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
     public void verifyGetAssetPathWithContentSection() {
-        fail();
+        final Asset header = assetRepo.findById(-700L);
+        final Asset phb = assetRepo.findById(-800L);
+        final Asset servicesHeader = assetRepo.findById(-900L);
+        final Asset product1Datasheet = assetRepo.findById(-1000L);
+        final Asset catalog = assetRepo.findById(-1100L);
+
+        assertThat(header, is(not(nullValue())));
+        assertThat(phb, is(not(nullValue())));
+        assertThat(servicesHeader, is(not(nullValue())));
+        assertThat(product1Datasheet, is(not(nullValue())));
+        assertThat(catalog, is(not(nullValue())));
+
+        assertThat(assetManager.getAssetPath(header, true),
+                   is(equalTo("info:/media/header.png")));
+        assertThat(assetManager.getAssetPath(phb, true),
+                   is(equalTo("info:/media/the-phb.png")));
+        assertThat(assetManager.getAssetPath(servicesHeader, true),
+                   is(equalTo("info:/media/services-header.png")));
+        assertThat(assetManager.getAssetPath(product1Datasheet, true),
+                   is(equalTo("")));
+        assertThat(assetManager.getAssetPath(catalog, true),
+                   is(equalTo("info:/media/catalog.pdf")));
     }
 
     /**
@@ -556,11 +621,47 @@ public class AssetManagerTest {
      * {@link AssetManager#getAssetFolder(org.librecms.assets.Asset)} for
      * various {@link Asset}s.
      */
+    @Test
     @InSequence(900)
     @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
     @ShouldMatchDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
     public void verifyGetAssetFolder() {
-        fail();
+        final Asset header = assetRepo.findById(-700L);
+        final Asset phb = assetRepo.findById(-800L);
+        final Asset servicesHeader = assetRepo.findById(-900L);
+        final Asset product1Datasheet = assetRepo.findById(-1000L);
+        final Asset catalog = assetRepo.findById(-1100L);
+
+        assertThat(header, is(not(nullValue())));
+        assertThat(phb, is(not(nullValue())));
+        assertThat(servicesHeader, is(not(nullValue())));
+        assertThat(product1Datasheet, is(not(nullValue())));
+        assertThat(catalog, is(not(nullValue())));
+
+        final Folder media = folderRepo.findById(-400L);
+        assertThat(media, is(not(nullValue())));
+
+        final Optional<Folder> headerFolder = assetManager
+                .getAssetFolder(header);
+        final Optional<Folder> phbFolder = assetManager
+                .getAssetFolder(phb);
+        final Optional<Folder> servicesHeaderFolder = assetManager
+                .getAssetFolder(servicesHeader);
+        final Optional<Folder> product1DatasheetFolder = assetManager
+                .getAssetFolder(product1Datasheet);
+        final Optional<Folder> catalogFolder = assetManager
+                .getAssetFolder(catalog);
+
+        assertThat(headerFolder.isPresent(), is(true));
+        assertThat(phbFolder.isPresent(), is(true));
+        assertThat(servicesHeaderFolder.isPresent(), is(true));
+        assertThat(product1DatasheetFolder.isPresent(), is(false));
+        assertThat(catalogFolder.isPresent(), is(true));
+
+        assertThat(headerFolder.get(), is(equalTo(media)));
+        assertThat(phbFolder.get(), is(equalTo(media)));
+        assertThat(servicesHeaderFolder.get(), is(equalTo(media)));
+        assertThat(catalogFolder.get(), is(equalTo(media)));
     }
 
     /**
@@ -568,11 +669,68 @@ public class AssetManagerTest {
      * }
      * for various {@link Asset}s.
      */
+    @Test
     @InSequence(1000)
     @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
     @ShouldMatchDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
     public void verifyGetAssetFolders() {
-        fail();
+        final Asset header = assetRepo.findById(-700L);
+        final Asset phb = assetRepo.findById(-800L);
+        final Asset servicesHeader = assetRepo.findById(-900L);
+        final Asset product1Datasheet = assetRepo.findById(-1000L);
+        final Asset catalog = assetRepo.findById(-1100L);
+
+        assertThat(header, is(not(nullValue())));
+        assertThat(phb, is(not(nullValue())));
+        assertThat(servicesHeader, is(not(nullValue())));
+        assertThat(product1Datasheet, is(not(nullValue())));
+        assertThat(catalog, is(not(nullValue())));
+
+        final Folder infoAssets = folderRepo.findById(-300L);
+        final Folder media = folderRepo.findById(-400L);
+
+        assertThat(infoAssets, is(not(nullValue())));
+        assertThat(media, is(not(nullValue())));
+
+        final List<Folder> headerFolders = assetManager.getAssetFolders(header);
+        final List<Folder> phbFolders = assetManager.getAssetFolders(phb);
+        final List<Folder> servicesHeaderFolders = assetManager.getAssetFolders(
+                phb);
+        final List<Folder> product1DatasheetFolders = assetManager.
+                getAssetFolders(product1Datasheet);
+        final List<Folder> catalogFolders = assetManager.
+                getAssetFolders(catalog);
+
+        assertThat(headerFolders, is(not(nullValue())));
+        assertThat(phbFolders, is(not(nullValue())));
+        assertThat(servicesHeaderFolders, is(not(nullValue())));
+        assertThat(product1DatasheetFolders, is(not(nullValue())));
+        assertThat(catalogFolders, is(not(nullValue())));
+
+        assertThat(headerFolders.isEmpty(), is(false));
+        assertThat(phbFolders.isEmpty(), is(false));
+        assertThat(servicesHeaderFolders.isEmpty(), is(false));
+        assertThat(product1DatasheetFolders.isEmpty(), is(true));
+        assertThat(catalogFolders.isEmpty(), is(false));
+
+        assertThat(headerFolders.size(), is(2));
+        assertThat(phbFolders.size(), is(2));
+        assertThat(servicesHeaderFolders.size(), is(2));
+        assertThat(product1DatasheetFolders.size(), is(0));
+        assertThat(catalogFolders.size(), is(2));
+
+        assertThat(headerFolders.get(0), is(equalTo(infoAssets)));
+        assertThat(headerFolders.get(1), is(equalTo(media)));
+
+        assertThat(phbFolders.get(0), is(equalTo(infoAssets)));
+        assertThat(phbFolders.get(1), is(equalTo(media)));
+
+        assertThat(servicesHeaderFolders.get(0), is(equalTo(infoAssets)));
+        assertThat(servicesHeaderFolders.get(1), is(equalTo(media)));
+
+        assertThat(catalogFolders.get(0), is(equalTo(infoAssets)));
+        assertThat(catalogFolders.get(1), is(equalTo(media)));
+
     }
 
 }

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

@@ -48,6 +48,14 @@ public class DatasetsTest extends DatasetsVerifier {
             "/datasets/org/librecms/assets/AssetRepositoryTest/after-delete.xml",
             
             "/datasets/org/librecms/assets/AssetManagerTest/data.xml",
+            "/datasets/org/librecms/assets/AssetManagerTest/after-clean-orphaned.xml",
+            "/datasets/org/librecms/assets/AssetManagerTest/after-copy-to-other-contentsection.xml",
+            "/datasets/org/librecms/assets/AssetManagerTest/after-copy-to-other-folder.xml",
+            "/datasets/org/librecms/assets/AssetManagerTest/after-copy-to-same-folder.xml",
+            "/datasets/org/librecms/assets/AssetManagerTest/after-create-nonshared.xml",
+            "/datasets/org/librecms/assets/AssetManagerTest/after-create-shared.xml",
+            "/datasets/org/librecms/assets/AssetManagerTest/after-move-to-other-contentsection.xml",
+            "/datasets/org/librecms/assets/AssetManagerTest/after-move-to-other-folder.xml",
         });
     }
 

ccm-cms/src/test/resources/datasets/org/librecms/assets/AssetManagerTest/after-clean-orphaned.xml

@@ -0,0 +1,562 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+
+    <!-- 
+        * 2 ContentSections with several asset folders
+        * CcmObject with existing AttachmentList
+        * several shared assets
+        
+    -->
+    
+    <ccm_core.ccm_revisions id="0"
+                            timestamp="1451602800" />
+    
+    <ccm_core.ccm_objects object_id="-100" 
+                          display_name="info"
+                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
+    <ccm_core.ccm_objects object_id="-200"
+                          display_name="info_root"
+                          uuid="82014239-9c06-486d-ae8c-4ae47f52a699" />
+    <ccm_core.ccm_objects object_id="-300"
+                          display_name="info_assets"
+                          uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    <ccm_core.ccm_objects object_id="-400"
+                          display_name="media"
+                          uuid="f8546369-4d06-47ea-9138-345d29ab8d68" />
+    <ccm_core.ccm_objects object_id="-500"
+                          display_name="data"
+                          uuid="18fbc7f4-ce7e-45d6-8dad-02887164b99d" />
+    <ccm_core.ccm_objects object_id="-600"
+                          display_name="article1"
+                          uuid="aed4b402-1180-46c6-b42d-7245f4dca248" />
+    <ccm_core.ccm_objects object_id="-700"
+                          display_name="header.png"
+                          uuid="4635589f-b87a-46d9-979e-6af14af063e5" />
+    <ccm_core.ccm_objects object_id="-800"
+                          display_name="the-phb.png"
+                          uuid="0a192e98-3b28-49d0-833f-bc9ff5f9d1d4" />
+    <ccm_core.ccm_objects object_id="-900"
+                          display_name="services-header.png"
+                          uuid="3fe13eb8-ec8d-4523-b42a-7fe1d5cf1a44" />
+    <ccm_core.ccm_objects object_id="-1000"
+                          display_name="product1-datasheet.pdf"
+                          uuid="0393840f-06a6-4ec3-aeb3-a612f845ad60" />
+    <ccm_core.ccm_objects object_id="-1100"
+                          display_name="catalog.pdf"
+                          uuid="cee702ad-79f7-4f78-b93d-46932d958c1c" />
+    <ccm_core.ccm_objects object_id="-1150"
+                          display_name="orphan.png"
+                          uuid="978849a8-6f2d-4746-bec0-05eccf53fc30" />
+    <ccm_core.ccm_objects object_id="-1200"
+                          display_name="org.librecms.contenttypes.Article"
+                          uuid="bd061ab6-9c4f-45ff-ab69-f521008eeac3" />
+    <ccm_core.ccm_objects object_id="-1300" 
+                          display_name="projects"
+                          uuid="2ac48bb5-a5fd-4e30-a80d-d895c2cad78a" />
+    <ccm_core.ccm_objects object_id="-1400"
+                          display_name="projects_root"
+                          uuid="fa88836d-3f3e-4197-949a-e9c697400bf0" />
+    <ccm_core.ccm_objects object_id="-1500"
+                          display_name="projects_assets"
+                          uuid="88c99d18-3a58-477b-89ea-e0ee6d1e4c56" />
+    <ccm_core.ccm_objects object_id="-1600"
+                          display_name="media"
+                          uuid="ec3f0d51-5d9b-440e-bb5a-5fac7da94af1" />
+    <ccm_core.ccm_objects object_id="-1700"
+                          display_name="data"
+                          uuid="80086df3-d682-42bb-9939-8cc04a300575" />
+    
+    <ccm_core.ccm_objects_aud object_id="-600"
+                              rev="0"
+                              revtype="0"
+                              display_name="article1" />
+    <ccm_core.ccm_objects_aud object_id="-700"
+                              rev="0"
+                              revtype="0"
+                              display_name="header.png" />
+    <ccm_core.ccm_objects_aud object_id="-800"
+                              rev="0"
+                              revtype="0"
+                              display_name="the-phb.png" />
+    <ccm_core.ccm_objects_aud object_id="-900"
+                              rev="0"
+                              revtype="0"
+                              display_name="services-header.png" />
+    <ccm_core.ccm_objects_aud object_id="-1000"
+                              rev="0"
+                              revtype="0"
+                              display_name="product1-datasheet.pdf" />
+    <ccm_core.ccm_objects_aud object_id="-1100"
+                              rev="0"
+                              revtype="0"
+                              display_name="catalog.pdf" />
+    <ccm_core.ccm_objects_aud object_id="-1150"
+                              rev="0"
+                              revtype="0"
+                              display_name="orphan.png" />
+
+    <ccm_core.categories object_id="-200" 
+                         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="-300"
+                         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="-400"
+                         unique_id="f8546369-4d06-47ea-9138-345d29ab8d68" 
+                         name="media" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1"/>
+    <ccm_core.categories object_id="-500" 
+                         unique_id="18fbc7f4-ce7e-45d6-8dad-02887164b99d" 
+                         name="data" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1"/>
+    <ccm_core.categories object_id="-1400" 
+                         unique_id="fa88836d-3f3e-4197-949a-e9c697400bf0" 
+                         name="projects_root"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-1500" 
+                         unique_id="88c99d18-3a58-477b-89ea-e0ee6d1e4c56" 
+                         name="projects_assets"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-1600" 
+                         unique_id="ec3f0d51-5d9b-440e-bb5a-5fac7da94af1" 
+                         name="media"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1"    />
+    <ccm_core.categories object_id="-1700" 
+                         unique_id="80086df3-d682-42bb-9939-8cc04a300575"
+                         name="data"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1"    />
+
+    <ccm_core.category_titles object_id="-200"
+                              locale="en"
+                              localized_value="info_root" />
+    <ccm_core.category_titles object_id="-300"
+                              locale="en"
+                              localized_value="info_assets" />
+    <ccm_core.category_titles object_id="-400"
+                              locale="en"
+                              localized_value="media" />
+    <ccm_core.category_titles object_id="-500"
+                              locale="en"
+                              localized_value="data" />
+    <ccm_core.category_titles object_id="-1400"
+                              locale="en"
+                              localized_value="projects_root" />
+    <ccm_core.category_titles object_id="-1500"
+                              locale="en"
+                              localized_value="projects_assets" />
+    <ccm_core.category_titles object_id="-1600"
+                              locale="en"
+                              localized_value="media" />
+    <ccm_core.category_titles object_id="-1700"
+                              locale="en"
+                              localized_value="data" />
+    
+    
+    <ccm_core.resources object_id="-100" 
+                        created="2016-07-15" />
+    <ccm_core.resources object_id="-1300" 
+                        created="2016-07-15" />
+
+    <ccm_core.applications object_id="-100"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="info" />
+    <ccm_core.applications object_id="-1300"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="projects" />
+
+    <ccm_cms.folders object_id="-200"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-300"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-400"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-500"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-1400"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-1500"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-1600"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-1700"
+                     type="ASSETS_FOLDER" />
+    
+    <ccm_cms.content_sections object_id="-100"
+                              label="info"
+                              root_documents_folder_id="-200"
+                              root_assets_folder_id="-300" />
+    <ccm_cms.content_sections object_id="-1300"
+                              label="projects"
+                              root_documents_folder_id="-1400"
+                              root_assets_folder_id="-1500" />
+
+    <ccm_cms.folder_content_section_map folder_id="-200" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-300" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-400" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-500" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-1400" 
+                                        content_section_id="-1300" />
+    <ccm_cms.folder_content_section_map folder_id="-1500" 
+                                        content_section_id="-1300" />
+    <ccm_cms.folder_content_section_map folder_id="-1600" 
+                                        content_section_id="-1300" />
+    <ccm_cms.folder_content_section_map folder_id="-1700" 
+                                        content_section_id="-1300" />
+    
+    <ccm_cms.content_types object_id="-1200" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-100" />
+
+    <ccm_cms.content_items object_id="-600" 
+                           item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248"
+                           version="DRAFT"
+                           content_type_id="-1200" />
+    
+    <ccm_cms.assets object_id="-700" />
+    <ccm_cms.assets object_id="-800" />
+    <ccm_cms.assets object_id="-900" />
+    <ccm_cms.assets object_id="-1000" />
+    <ccm_cms.assets object_id="-1100" />
+    <ccm_cms.assets object_id="-1150" />
+    
+    <ccm_cms.assets_aud object_id="-700" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-800" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-900" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-1000" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-1100" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-1150" 
+                        rev="0" />
+    
+    <ccm_cms.asset_titles asset_id="-700" 
+                          localized_value="header.png" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-800" 
+                          localized_value="the-phb.png" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-900" 
+                          localized_value="services-header.png" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-1000" 
+                          localized_value="product1-datasheet.pdf" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-1100" 
+                          localized_value="catelog.pdf" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-1150" 
+                          localized_value="orphan.pdf" 
+                          locale="en" />
+    
+    <ccm_cms.binary_assets object_id="-700" 
+                           filename="header.png" 
+                           mime_type="image/png" 
+                           data_size="0" />
+    <ccm_cms.binary_assets object_id="-800" 
+                           filename="the-phb.png" 
+                           mime_type="image/png" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-900" 
+                           filename="services-header.png" 
+                           mime_type="image/png" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1000" 
+                           filename="product1-datasheet.pdf"
+                           mime_type="application/pdf" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1100" 
+                           filename="catalog.pdf" 
+                           mime_type="application/pdf" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1150" 
+                           filename="orphan.png" 
+                           mime_type="image/png" 
+                           data_size="0"/>
+    
+    <ccm_cms.binary_assets_aud object_id="-700" 
+                               rev="0"
+                               filename="header.png" 
+                               mime_type="image/png" 
+                               data_size="0"/>
+    <ccm_cms.binary_assets_aud object_id="-800" 
+                               rev="0"
+                               filename="the-phb.png" 
+                               mime_type="image/png" 
+                               data_size="0"/>
+    <ccm_cms.binary_assets_aud object_id="-900" 
+                               rev="0"
+                               filename="services-header.png" 
+                               mime_type="image/png" 
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-1000" 
+                               rev="0"
+                               filename="product1-datasheet.pdf"
+                               mime_type="application/pdf"
+                               data_size="0"    />
+    <ccm_cms.binary_assets_aud object_id="-1100" 
+                               rev="0"
+                               filename="catalog.pdf" 
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-1150" 
+                               rev="0"
+                               filename="orphan.png" 
+                               mime_type="image/png"
+                               data_size="0" />
+    
+    <ccm_cms.images object_id="-700" 
+                    height="0"
+                    width="0" />
+    <ccm_cms.images object_id="-800"
+                    height="0"
+                    width="0" />
+    <ccm_cms.images object_id="-900"
+                    height="0"
+                    width="0" />
+    <ccm_cms.images object_id="-1150"
+                    height="0"
+                    width="0" />
+    
+    <ccm_cms.images_aud object_id="-700" 
+                        rev="0" 
+                        height="0"
+                        width="0" />
+    <ccm_cms.images_aud object_id="-800" 
+                        rev="0"
+                        height="0"
+                        width="0" />
+    <ccm_cms.images_aud object_id="-900" 
+                        rev="0"
+                        height="0"
+                        width="0" />
+    <ccm_cms.images_aud object_id="-1150" 
+                        rev="0"
+                        height="0"
+                        width="0" />
+    
+    <ccm_cms.files object_id="-1000" />
+    <ccm_cms.files object_id="-1100" />
+    
+    <ccm_cms.files_aud object_id="-1000" 
+                       rev="0" />
+    <ccm_cms.files_aud object_id="-1100" 
+                       rev="0" />
+    
+    <ccm_cms.asset_titles_aud asset_id="-700" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="header.png" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-800" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="the-phb.png" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-900" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="services-header.png" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-1000" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="product1-datasheet.pdf" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-1100" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="catelog.pdf" 
+                              locale="en" />
+
+    
+    <ccm_cms.content_items_aud object_id="-600" 
+                               rev="0"
+                               item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248" 
+                               version="DRAFT" 
+                               content_type_id="-1200" />
+
+    <ccm_cms.content_item_names object_id="-600" 
+                                locale="en" 
+                                localized_value="article1" />
+
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-600"
+                                    localized_value="article1"
+                                    locale="en"
+                                    revtype="0" />
+
+    <ccm_cms.content_item_titles object_id="-600" 
+                                 locale="en" 
+                                 localized_value="Article 1" />
+
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-600"
+                                     localized_value="Article 1"
+                                     locale="en"
+                                     revtype="0" />
+    
+    <ccm_cms.content_type_labels object_id="-1200"
+                                 locale="en" 
+                                 localized_value="Article" />
+
+    <ccm_cms.articles object_id="-600" />
+    
+    <ccm_cms.article_texts 
+        object_id="-600"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-600" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
+        locale="en" 
+        revtype="0" />
+    
+    <ccm_core.categorizations categorization_id="-30100" 
+                              category_id="-200" 
+                              object_id="-600" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30200" 
+                              category_id="-400" 
+                              object_id="-700" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30300" 
+                              category_id="-400" 
+                              object_id="-800" 
+                              category_order="1" 
+                              object_order="3" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30400" 
+                              category_id="-400" 
+                              object_id="-900" 
+                              category_order="1" 
+                              object_order="4" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30600" 
+                              category_id="-400" 
+                              object_id="-1100" 
+                              category_order="1" 
+                              object_order="6" 
+                              category_index="false"
+                              type="folder" />
+    
+    <ccm_cms.attachment_lists list_id="-40100"
+                              name="images"
+                              list_order="1"
+                              uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
+                              item_id="-600" />
+    <ccm_cms.attachment_lists list_id="-40200"
+                              name="downloads"
+                              list_order="1"
+                              uuid="b39e4937-9f15-4b1f-9869-5a1107612e94"
+                              item_id="-600" />
+    
+    <ccm_cms.attachment_lists_aud list_id="-40100"
+                                  rev="0"
+                                  revtype="0"
+                                  name="images"
+                                  list_order="1"
+                                  uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
+                                  item_id="-600" />
+    <ccm_cms.attachment_lists_aud list_id="-40200"
+                                  rev="0"
+                                  revtype="0"
+                                  name="images"
+                                  list_order="1"
+                                  uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
+                                  item_id="-600" />
+    
+    <ccm_cms.attachments attachment_id="-50100"
+                         sort_key="1"
+                         uuid="eb7abe31-9b87-420b-8e5c-ca740b6e54d8"
+                         asset_id="-700"
+                         attachment_list_id="-40100" />
+    <ccm_cms.attachments attachment_id="-50200"
+                         sort_key="2"
+                         uuid="53e090c1-d7b8-4e86-881b-75d7d0bb5218"
+                         asset_id="-900"
+                         attachment_list_id="-40100" />
+    <ccm_cms.attachments attachment_id="-50300"
+                         sort_key="1"
+                         uuid="d1d56133-c139-4ee1-8f37-3a60c34b6dc4"
+                         asset_id="-1000"
+                         attachment_list_id="-40200" />
+    <ccm_cms.attachments attachment_id="-50400"
+                         sort_key="1"
+                         uuid="2ab364cf-28a9-4c3d-803c-a7742e7d49cd"
+                         asset_id="-1100"
+                         attachment_list_id="-40200" />
+    
+    <ccm_cms.attachments_aud attachment_id="-50100"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="eb7abe31-9b87-420b-8e5c-ca740b6e54d8"
+                             asset_id="-700"
+                             attachment_list_id="-40100" />
+    <ccm_cms.attachments_aud attachment_id="-50200"
+                             rev="0"
+                             revtype="0"
+                             sort_key="2"
+                             uuid="53e090c1-d7b8-4e86-881b-75d7d0bb5218"
+                             asset_id="-900"
+                             attachment_list_id="-40100" />
+    <ccm_cms.attachments_aud attachment_id="-50300"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="d1d56133-c139-4ee1-8f37-3a60c34b6dc4"
+                             asset_id="-1000"
+                             attachment_list_id="-40200" />
+    <ccm_cms.attachments_aud attachment_id="-50400"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="2ab364cf-28a9-4c3d-803c-a7742e7d49cd"
+                             asset_id="-1100"
+                             attachment_list_id="-40200" />
+
+        
+</dataset>

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

@@ -0,0 +1,562 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+
+    <!-- 
+        * 2 ContentSections with several asset folders
+        * CcmObject with existing AttachmentList
+        * several shared assets
+        
+    -->
+    
+    <ccm_core.ccm_revisions id="0"
+                            timestamp="1451602800" />
+    
+    <ccm_core.ccm_objects object_id="-100" 
+                          display_name="info"
+                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
+    <ccm_core.ccm_objects object_id="-200"
+                          display_name="info_root"
+                          uuid="82014239-9c06-486d-ae8c-4ae47f52a699" />
+    <ccm_core.ccm_objects object_id="-300"
+                          display_name="info_assets"
+                          uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    <ccm_core.ccm_objects object_id="-400"
+                          display_name="media"
+                          uuid="f8546369-4d06-47ea-9138-345d29ab8d68" />
+    <ccm_core.ccm_objects object_id="-500"
+                          display_name="data"
+                          uuid="18fbc7f4-ce7e-45d6-8dad-02887164b99d" />
+    <ccm_core.ccm_objects object_id="-600"
+                          display_name="article1"
+                          uuid="aed4b402-1180-46c6-b42d-7245f4dca248" />
+    <ccm_core.ccm_objects object_id="-700"
+                          display_name="header.png"
+                          uuid="4635589f-b87a-46d9-979e-6af14af063e5" />
+    <ccm_core.ccm_objects object_id="-800"
+                          display_name="the-phb.png"
+                          uuid="0a192e98-3b28-49d0-833f-bc9ff5f9d1d4" />
+    <ccm_core.ccm_objects object_id="-900"
+                          display_name="services-header.png"
+                          uuid="3fe13eb8-ec8d-4523-b42a-7fe1d5cf1a44" />
+    <ccm_core.ccm_objects object_id="-1000"
+                          display_name="product1-datasheet.pdf"
+                          uuid="0393840f-06a6-4ec3-aeb3-a612f845ad60" />
+    <ccm_core.ccm_objects object_id="-1100"
+                          display_name="catalog.pdf"
+                          uuid="cee702ad-79f7-4f78-b93d-46932d958c1c" />
+    <ccm_core.ccm_objects object_id="-1150"
+                          display_name="orphan.png"
+                          uuid="978849a8-6f2d-4746-bec0-05eccf53fc30" />
+    <ccm_core.ccm_objects object_id="-1200"
+                          display_name="org.librecms.contenttypes.Article"
+                          uuid="bd061ab6-9c4f-45ff-ab69-f521008eeac3" />
+    <ccm_core.ccm_objects object_id="-1300" 
+                          display_name="projects"
+                          uuid="2ac48bb5-a5fd-4e30-a80d-d895c2cad78a" />
+    <ccm_core.ccm_objects object_id="-1400"
+                          display_name="projects_root"
+                          uuid="fa88836d-3f3e-4197-949a-e9c697400bf0" />
+    <ccm_core.ccm_objects object_id="-1500"
+                          display_name="projects_assets"
+                          uuid="88c99d18-3a58-477b-89ea-e0ee6d1e4c56" />
+    <ccm_core.ccm_objects object_id="-1600"
+                          display_name="media"
+                          uuid="ec3f0d51-5d9b-440e-bb5a-5fac7da94af1" />
+    <ccm_core.ccm_objects object_id="-1700"
+                          display_name="data"
+                          uuid="80086df3-d682-42bb-9939-8cc04a300575" />
+    
+    <ccm_core.ccm_objects_aud object_id="-600"
+                              rev="0"
+                              revtype="0"
+                              display_name="article1" />
+    <ccm_core.ccm_objects_aud object_id="-700"
+                              rev="0"
+                              revtype="0"
+                              display_name="header.png" />
+    <ccm_core.ccm_objects_aud object_id="-800"
+                              rev="0"
+                              revtype="0"
+                              display_name="the-phb.png" />
+    <ccm_core.ccm_objects_aud object_id="-900"
+                              rev="0"
+                              revtype="0"
+                              display_name="services-header.png" />
+    <ccm_core.ccm_objects_aud object_id="-1000"
+                              rev="0"
+                              revtype="0"
+                              display_name="product1-datasheet.pdf" />
+    <ccm_core.ccm_objects_aud object_id="-1100"
+                              rev="0"
+                              revtype="0"
+                              display_name="catalog.pdf" />
+    <ccm_core.ccm_objects_aud object_id="-1150"
+                              rev="0"
+                              revtype="0"
+                              display_name="orphan.png" />
+
+    <ccm_core.categories object_id="-200" 
+                         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="-300"
+                         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="-400"
+                         unique_id="f8546369-4d06-47ea-9138-345d29ab8d68" 
+                         name="media" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1"/>
+    <ccm_core.categories object_id="-500" 
+                         unique_id="18fbc7f4-ce7e-45d6-8dad-02887164b99d" 
+                         name="data" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1"/>
+    <ccm_core.categories object_id="-1400" 
+                         unique_id="fa88836d-3f3e-4197-949a-e9c697400bf0" 
+                         name="projects_root"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-1500" 
+                         unique_id="88c99d18-3a58-477b-89ea-e0ee6d1e4c56" 
+                         name="projects_assets"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-1600" 
+                         unique_id="ec3f0d51-5d9b-440e-bb5a-5fac7da94af1" 
+                         name="media"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1"    />
+    <ccm_core.categories object_id="-1700" 
+                         unique_id="80086df3-d682-42bb-9939-8cc04a300575"
+                         name="data"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1"    />
+
+    <ccm_core.category_titles object_id="-200"
+                              locale="en"
+                              localized_value="info_root" />
+    <ccm_core.category_titles object_id="-300"
+                              locale="en"
+                              localized_value="info_assets" />
+    <ccm_core.category_titles object_id="-400"
+                              locale="en"
+                              localized_value="media" />
+    <ccm_core.category_titles object_id="-500"
+                              locale="en"
+                              localized_value="data" />
+    <ccm_core.category_titles object_id="-1400"
+                              locale="en"
+                              localized_value="projects_root" />
+    <ccm_core.category_titles object_id="-1500"
+                              locale="en"
+                              localized_value="projects_assets" />
+    <ccm_core.category_titles object_id="-1600"
+                              locale="en"
+                              localized_value="media" />
+    <ccm_core.category_titles object_id="-1700"
+                              locale="en"
+                              localized_value="data" />
+    
+    
+    <ccm_core.resources object_id="-100" 
+                        created="2016-07-15" />
+    <ccm_core.resources object_id="-1300" 
+                        created="2016-07-15" />
+
+    <ccm_core.applications object_id="-100"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="info" />
+    <ccm_core.applications object_id="-1300"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="projects" />
+
+    <ccm_cms.folders object_id="-200"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-300"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-400"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-500"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-1400"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-1500"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-1600"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-1700"
+                     type="ASSETS_FOLDER" />
+    
+    <ccm_cms.content_sections object_id="-100"
+                              label="info"
+                              root_documents_folder_id="-200"
+                              root_assets_folder_id="-300" />
+    <ccm_cms.content_sections object_id="-1300"
+                              label="projects"
+                              root_documents_folder_id="-1400"
+                              root_assets_folder_id="-1500" />
+
+    <ccm_cms.folder_content_section_map folder_id="-200" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-300" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-400" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-500" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-1400" 
+                                        content_section_id="-1300" />
+    <ccm_cms.folder_content_section_map folder_id="-1500" 
+                                        content_section_id="-1300" />
+    <ccm_cms.folder_content_section_map folder_id="-1600" 
+                                        content_section_id="-1300" />
+    <ccm_cms.folder_content_section_map folder_id="-1700" 
+                                        content_section_id="-1300" />
+    
+    <ccm_cms.content_types object_id="-1200" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-100" />
+
+    <ccm_cms.content_items object_id="-600" 
+                           item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248"
+                           version="DRAFT"
+                           content_type_id="-1200" />
+    
+    <ccm_cms.assets object_id="-700" />
+    <ccm_cms.assets object_id="-800" />
+    <ccm_cms.assets object_id="-900" />
+    <ccm_cms.assets object_id="-1000" />
+    <ccm_cms.assets object_id="-1100" />
+    <ccm_cms.assets object_id="-1150" />
+    
+    <ccm_cms.assets_aud object_id="-700" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-800" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-900" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-1000" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-1100" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-1150" 
+                        rev="0" />
+    
+    <ccm_cms.asset_titles asset_id="-700" 
+                          localized_value="header.png" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-800" 
+                          localized_value="the-phb.png" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-900" 
+                          localized_value="services-header.png" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-1000" 
+                          localized_value="product1-datasheet.pdf" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-1100" 
+                          localized_value="catelog.pdf" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-1150" 
+                          localized_value="orphan.pdf" 
+                          locale="en" />
+    
+    <ccm_cms.binary_assets object_id="-700" 
+                           filename="header.png" 
+                           mime_type="image/png" 
+                           data_size="0" />
+    <ccm_cms.binary_assets object_id="-800" 
+                           filename="the-phb.png" 
+                           mime_type="image/png" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-900" 
+                           filename="services-header.png" 
+                           mime_type="image/png" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1000" 
+                           filename="product1-datasheet.pdf"
+                           mime_type="application/pdf" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1100" 
+                           filename="catalog.pdf" 
+                           mime_type="application/pdf" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1150" 
+                           filename="orphan.png" 
+                           mime_type="image/png" 
+                           data_size="0"/>
+    
+    <ccm_cms.binary_assets_aud object_id="-700" 
+                               rev="0"
+                               filename="header.png" 
+                               mime_type="image/png" 
+                               data_size="0"/>
+    <ccm_cms.binary_assets_aud object_id="-800" 
+                               rev="0"
+                               filename="the-phb.png" 
+                               mime_type="image/png" 
+                               data_size="0"/>
+    <ccm_cms.binary_assets_aud object_id="-900" 
+                               rev="0"
+                               filename="services-header.png" 
+                               mime_type="image/png" 
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-1000" 
+                               rev="0"
+                               filename="product1-datasheet.pdf"
+                               mime_type="application/pdf"
+                               data_size="0"    />
+    <ccm_cms.binary_assets_aud object_id="-1100" 
+                               rev="0"
+                               filename="catalog.pdf" 
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-1150" 
+                               rev="0"
+                               filename="orphan.png" 
+                               mime_type="image/png"
+                               data_size="0" />
+    
+    <ccm_cms.images object_id="-700" 
+                    height="0"
+                    width="0" />
+    <ccm_cms.images object_id="-800"
+                    height="0"
+                    width="0" />
+    <ccm_cms.images object_id="-900"
+                    height="0"
+                    width="0" />
+    <ccm_cms.images object_id="-1150"
+                    height="0"
+                    width="0" />
+    
+    <ccm_cms.images_aud object_id="-700" 
+                        rev="0" 
+                        height="0"
+                        width="0" />
+    <ccm_cms.images_aud object_id="-800" 
+                        rev="0"
+                        height="0"
+                        width="0" />
+    <ccm_cms.images_aud object_id="-900" 
+                        rev="0"
+                        height="0"
+                        width="0" />
+    <ccm_cms.images_aud object_id="-1150" 
+                        rev="0"
+                        height="0"
+                        width="0" />
+    
+    <ccm_cms.files object_id="-1000" />
+    <ccm_cms.files object_id="-1100" />
+    
+    <ccm_cms.files_aud object_id="-1000" 
+                       rev="0" />
+    <ccm_cms.files_aud object_id="-1100" 
+                       rev="0" />
+    
+    <ccm_cms.asset_titles_aud asset_id="-700" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="header.png" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-800" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="the-phb.png" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-900" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="services-header.png" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-1000" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="product1-datasheet.pdf" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-1100" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="catelog.pdf" 
+                              locale="en" />
+
+    
+    <ccm_cms.content_items_aud object_id="-600" 
+                               rev="0"
+                               item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248" 
+                               version="DRAFT" 
+                               content_type_id="-1200" />
+
+    <ccm_cms.content_item_names object_id="-600" 
+                                locale="en" 
+                                localized_value="article1" />
+
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-600"
+                                    localized_value="article1"
+                                    locale="en"
+                                    revtype="0" />
+
+    <ccm_cms.content_item_titles object_id="-600" 
+                                 locale="en" 
+                                 localized_value="Article 1" />
+
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-600"
+                                     localized_value="Article 1"
+                                     locale="en"
+                                     revtype="0" />
+    
+    <ccm_cms.content_type_labels object_id="-1200"
+                                 locale="en" 
+                                 localized_value="Article" />
+
+    <ccm_cms.articles object_id="-600" />
+    
+    <ccm_cms.article_texts 
+        object_id="-600"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-600" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
+        locale="en" 
+        revtype="0" />
+    
+    <ccm_core.categorizations categorization_id="-30100" 
+                              category_id="-200" 
+                              object_id="-600" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30200" 
+                              category_id="-400" 
+                              object_id="-700" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30300" 
+                              category_id="-400" 
+                              object_id="-800" 
+                              category_order="1" 
+                              object_order="3" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30400" 
+                              category_id="-400" 
+                              object_id="-900" 
+                              category_order="1" 
+                              object_order="4" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30600" 
+                              category_id="-400" 
+                              object_id="-1100" 
+                              category_order="1" 
+                              object_order="6" 
+                              category_index="false"
+                              type="folder" />
+    
+    <ccm_cms.attachment_lists list_id="-40100"
+                              name="images"
+                              list_order="1"
+                              uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
+                              item_id="-600" />
+    <ccm_cms.attachment_lists list_id="-40200"
+                              name="downloads"
+                              list_order="1"
+                              uuid="b39e4937-9f15-4b1f-9869-5a1107612e94"
+                              item_id="-600" />
+    
+    <ccm_cms.attachment_lists_aud list_id="-40100"
+                                  rev="0"
+                                  revtype="0"
+                                  name="images"
+                                  list_order="1"
+                                  uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
+                                  item_id="-600" />
+    <ccm_cms.attachment_lists_aud list_id="-40200"
+                                  rev="0"
+                                  revtype="0"
+                                  name="images"
+                                  list_order="1"
+                                  uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
+                                  item_id="-600" />
+    
+    <ccm_cms.attachments attachment_id="-50100"
+                         sort_key="1"
+                         uuid="eb7abe31-9b87-420b-8e5c-ca740b6e54d8"
+                         asset_id="-700"
+                         attachment_list_id="-40100" />
+    <ccm_cms.attachments attachment_id="-50200"
+                         sort_key="2"
+                         uuid="53e090c1-d7b8-4e86-881b-75d7d0bb5218"
+                         asset_id="-900"
+                         attachment_list_id="-40100" />
+    <ccm_cms.attachments attachment_id="-50300"
+                         sort_key="1"
+                         uuid="d1d56133-c139-4ee1-8f37-3a60c34b6dc4"
+                         asset_id="-1000"
+                         attachment_list_id="-40200" />
+    <ccm_cms.attachments attachment_id="-50400"
+                         sort_key="1"
+                         uuid="2ab364cf-28a9-4c3d-803c-a7742e7d49cd"
+                         asset_id="-1100"
+                         attachment_list_id="-40200" />
+    
+    <ccm_cms.attachments_aud attachment_id="-50100"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="eb7abe31-9b87-420b-8e5c-ca740b6e54d8"
+                             asset_id="-700"
+                             attachment_list_id="-40100" />
+    <ccm_cms.attachments_aud attachment_id="-50200"
+                             rev="0"
+                             revtype="0"
+                             sort_key="2"
+                             uuid="53e090c1-d7b8-4e86-881b-75d7d0bb5218"
+                             asset_id="-900"
+                             attachment_list_id="-40100" />
+    <ccm_cms.attachments_aud attachment_id="-50300"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="d1d56133-c139-4ee1-8f37-3a60c34b6dc4"
+                             asset_id="-1000"
+                             attachment_list_id="-40200" />
+    <ccm_cms.attachments_aud attachment_id="-50400"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="2ab364cf-28a9-4c3d-803c-a7742e7d49cd"
+                             asset_id="-1100"
+                             attachment_list_id="-40200" />
+
+        
+</dataset>

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

@@ -0,0 +1,562 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+
+    <!-- 
+        * 2 ContentSections with several asset folders
+        * CcmObject with existing AttachmentList
+        * several shared assets
+        
+    -->
+    
+    <ccm_core.ccm_revisions id="0"
+                            timestamp="1451602800" />
+    
+    <ccm_core.ccm_objects object_id="-100" 
+                          display_name="info"
+                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
+    <ccm_core.ccm_objects object_id="-200"
+                          display_name="info_root"
+                          uuid="82014239-9c06-486d-ae8c-4ae47f52a699" />
+    <ccm_core.ccm_objects object_id="-300"
+                          display_name="info_assets"
+                          uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    <ccm_core.ccm_objects object_id="-400"
+                          display_name="media"
+                          uuid="f8546369-4d06-47ea-9138-345d29ab8d68" />
+    <ccm_core.ccm_objects object_id="-500"
+                          display_name="data"
+                          uuid="18fbc7f4-ce7e-45d6-8dad-02887164b99d" />
+    <ccm_core.ccm_objects object_id="-600"
+                          display_name="article1"
+                          uuid="aed4b402-1180-46c6-b42d-7245f4dca248" />
+    <ccm_core.ccm_objects object_id="-700"
+                          display_name="header.png"
+                          uuid="4635589f-b87a-46d9-979e-6af14af063e5" />
+    <ccm_core.ccm_objects object_id="-800"
+                          display_name="the-phb.png"
+                          uuid="0a192e98-3b28-49d0-833f-bc9ff5f9d1d4" />
+    <ccm_core.ccm_objects object_id="-900"
+                          display_name="services-header.png"
+                          uuid="3fe13eb8-ec8d-4523-b42a-7fe1d5cf1a44" />
+    <ccm_core.ccm_objects object_id="-1000"
+                          display_name="product1-datasheet.pdf"
+                          uuid="0393840f-06a6-4ec3-aeb3-a612f845ad60" />
+    <ccm_core.ccm_objects object_id="-1100"
+                          display_name="catalog.pdf"
+                          uuid="cee702ad-79f7-4f78-b93d-46932d958c1c" />
+    <ccm_core.ccm_objects object_id="-1150"
+                          display_name="orphan.png"
+                          uuid="978849a8-6f2d-4746-bec0-05eccf53fc30" />
+    <ccm_core.ccm_objects object_id="-1200"
+                          display_name="org.librecms.contenttypes.Article"
+                          uuid="bd061ab6-9c4f-45ff-ab69-f521008eeac3" />
+    <ccm_core.ccm_objects object_id="-1300" 
+                          display_name="projects"
+                          uuid="2ac48bb5-a5fd-4e30-a80d-d895c2cad78a" />
+    <ccm_core.ccm_objects object_id="-1400"
+                          display_name="projects_root"
+                          uuid="fa88836d-3f3e-4197-949a-e9c697400bf0" />
+    <ccm_core.ccm_objects object_id="-1500"
+                          display_name="projects_assets"
+                          uuid="88c99d18-3a58-477b-89ea-e0ee6d1e4c56" />
+    <ccm_core.ccm_objects object_id="-1600"
+                          display_name="media"
+                          uuid="ec3f0d51-5d9b-440e-bb5a-5fac7da94af1" />
+    <ccm_core.ccm_objects object_id="-1700"
+                          display_name="data"
+                          uuid="80086df3-d682-42bb-9939-8cc04a300575" />
+    
+    <ccm_core.ccm_objects_aud object_id="-600"
+                              rev="0"
+                              revtype="0"
+                              display_name="article1" />
+    <ccm_core.ccm_objects_aud object_id="-700"
+                              rev="0"
+                              revtype="0"
+                              display_name="header.png" />
+    <ccm_core.ccm_objects_aud object_id="-800"
+                              rev="0"
+                              revtype="0"
+                              display_name="the-phb.png" />
+    <ccm_core.ccm_objects_aud object_id="-900"
+                              rev="0"
+                              revtype="0"
+                              display_name="services-header.png" />
+    <ccm_core.ccm_objects_aud object_id="-1000"
+                              rev="0"
+                              revtype="0"
+                              display_name="product1-datasheet.pdf" />
+    <ccm_core.ccm_objects_aud object_id="-1100"
+                              rev="0"
+                              revtype="0"
+                              display_name="catalog.pdf" />
+    <ccm_core.ccm_objects_aud object_id="-1150"
+                              rev="0"
+                              revtype="0"
+                              display_name="orphan.png" />
+
+    <ccm_core.categories object_id="-200" 
+                         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="-300"
+                         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="-400"
+                         unique_id="f8546369-4d06-47ea-9138-345d29ab8d68" 
+                         name="media" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1"/>
+    <ccm_core.categories object_id="-500" 
+                         unique_id="18fbc7f4-ce7e-45d6-8dad-02887164b99d" 
+                         name="data" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1"/>
+    <ccm_core.categories object_id="-1400" 
+                         unique_id="fa88836d-3f3e-4197-949a-e9c697400bf0" 
+                         name="projects_root"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-1500" 
+                         unique_id="88c99d18-3a58-477b-89ea-e0ee6d1e4c56" 
+                         name="projects_assets"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-1600" 
+                         unique_id="ec3f0d51-5d9b-440e-bb5a-5fac7da94af1" 
+                         name="media"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1"    />
+    <ccm_core.categories object_id="-1700" 
+                         unique_id="80086df3-d682-42bb-9939-8cc04a300575"
+                         name="data"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1"    />
+
+    <ccm_core.category_titles object_id="-200"
+                              locale="en"
+                              localized_value="info_root" />
+    <ccm_core.category_titles object_id="-300"
+                              locale="en"
+                              localized_value="info_assets" />
+    <ccm_core.category_titles object_id="-400"
+                              locale="en"
+                              localized_value="media" />
+    <ccm_core.category_titles object_id="-500"
+                              locale="en"
+                              localized_value="data" />
+    <ccm_core.category_titles object_id="-1400"
+                              locale="en"
+                              localized_value="projects_root" />
+    <ccm_core.category_titles object_id="-1500"
+                              locale="en"
+                              localized_value="projects_assets" />
+    <ccm_core.category_titles object_id="-1600"
+                              locale="en"
+                              localized_value="media" />
+    <ccm_core.category_titles object_id="-1700"
+                              locale="en"
+                              localized_value="data" />
+    
+    
+    <ccm_core.resources object_id="-100" 
+                        created="2016-07-15" />
+    <ccm_core.resources object_id="-1300" 
+                        created="2016-07-15" />
+
+    <ccm_core.applications object_id="-100"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="info" />
+    <ccm_core.applications object_id="-1300"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="projects" />
+
+    <ccm_cms.folders object_id="-200"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-300"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-400"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-500"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-1400"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-1500"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-1600"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-1700"
+                     type="ASSETS_FOLDER" />
+    
+    <ccm_cms.content_sections object_id="-100"
+                              label="info"
+                              root_documents_folder_id="-200"
+                              root_assets_folder_id="-300" />
+    <ccm_cms.content_sections object_id="-1300"
+                              label="projects"
+                              root_documents_folder_id="-1400"
+                              root_assets_folder_id="-1500" />
+
+    <ccm_cms.folder_content_section_map folder_id="-200" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-300" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-400" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-500" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-1400" 
+                                        content_section_id="-1300" />
+    <ccm_cms.folder_content_section_map folder_id="-1500" 
+                                        content_section_id="-1300" />
+    <ccm_cms.folder_content_section_map folder_id="-1600" 
+                                        content_section_id="-1300" />
+    <ccm_cms.folder_content_section_map folder_id="-1700" 
+                                        content_section_id="-1300" />
+    
+    <ccm_cms.content_types object_id="-1200" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-100" />
+
+    <ccm_cms.content_items object_id="-600" 
+                           item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248"
+                           version="DRAFT"
+                           content_type_id="-1200" />
+    
+    <ccm_cms.assets object_id="-700" />
+    <ccm_cms.assets object_id="-800" />
+    <ccm_cms.assets object_id="-900" />
+    <ccm_cms.assets object_id="-1000" />
+    <ccm_cms.assets object_id="-1100" />
+    <ccm_cms.assets object_id="-1150" />
+    
+    <ccm_cms.assets_aud object_id="-700" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-800" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-900" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-1000" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-1100" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-1150" 
+                        rev="0" />
+    
+    <ccm_cms.asset_titles asset_id="-700" 
+                          localized_value="header.png" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-800" 
+                          localized_value="the-phb.png" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-900" 
+                          localized_value="services-header.png" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-1000" 
+                          localized_value="product1-datasheet.pdf" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-1100" 
+                          localized_value="catelog.pdf" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-1150" 
+                          localized_value="orphan.pdf" 
+                          locale="en" />
+    
+    <ccm_cms.binary_assets object_id="-700" 
+                           filename="header.png" 
+                           mime_type="image/png" 
+                           data_size="0" />
+    <ccm_cms.binary_assets object_id="-800" 
+                           filename="the-phb.png" 
+                           mime_type="image/png" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-900" 
+                           filename="services-header.png" 
+                           mime_type="image/png" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1000" 
+                           filename="product1-datasheet.pdf"
+                           mime_type="application/pdf" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1100" 
+                           filename="catalog.pdf" 
+                           mime_type="application/pdf" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1150" 
+                           filename="orphan.png" 
+                           mime_type="image/png" 
+                           data_size="0"/>
+    
+    <ccm_cms.binary_assets_aud object_id="-700" 
+                               rev="0"
+                               filename="header.png" 
+                               mime_type="image/png" 
+                               data_size="0"/>
+    <ccm_cms.binary_assets_aud object_id="-800" 
+                               rev="0"
+                               filename="the-phb.png" 
+                               mime_type="image/png" 
+                               data_size="0"/>
+    <ccm_cms.binary_assets_aud object_id="-900" 
+                               rev="0"
+                               filename="services-header.png" 
+                               mime_type="image/png" 
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-1000" 
+                               rev="0"
+                               filename="product1-datasheet.pdf"
+                               mime_type="application/pdf"
+                               data_size="0"    />
+    <ccm_cms.binary_assets_aud object_id="-1100" 
+                               rev="0"
+                               filename="catalog.pdf" 
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-1150" 
+                               rev="0"
+                               filename="orphan.png" 
+                               mime_type="image/png"
+                               data_size="0" />
+    
+    <ccm_cms.images object_id="-700" 
+                    height="0"
+                    width="0" />
+    <ccm_cms.images object_id="-800"
+                    height="0"
+                    width="0" />
+    <ccm_cms.images object_id="-900"
+                    height="0"
+                    width="0" />
+    <ccm_cms.images object_id="-1150"
+                    height="0"
+                    width="0" />
+    
+    <ccm_cms.images_aud object_id="-700" 
+                        rev="0" 
+                        height="0"
+                        width="0" />
+    <ccm_cms.images_aud object_id="-800" 
+                        rev="0"
+                        height="0"
+                        width="0" />
+    <ccm_cms.images_aud object_id="-900" 
+                        rev="0"
+                        height="0"
+                        width="0" />
+    <ccm_cms.images_aud object_id="-1150" 
+                        rev="0"
+                        height="0"
+                        width="0" />
+    
+    <ccm_cms.files object_id="-1000" />
+    <ccm_cms.files object_id="-1100" />
+    
+    <ccm_cms.files_aud object_id="-1000" 
+                       rev="0" />
+    <ccm_cms.files_aud object_id="-1100" 
+                       rev="0" />
+    
+    <ccm_cms.asset_titles_aud asset_id="-700" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="header.png" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-800" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="the-phb.png" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-900" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="services-header.png" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-1000" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="product1-datasheet.pdf" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-1100" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="catelog.pdf" 
+                              locale="en" />
+
+    
+    <ccm_cms.content_items_aud object_id="-600" 
+                               rev="0"
+                               item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248" 
+                               version="DRAFT" 
+                               content_type_id="-1200" />
+
+    <ccm_cms.content_item_names object_id="-600" 
+                                locale="en" 
+                                localized_value="article1" />
+
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-600"
+                                    localized_value="article1"
+                                    locale="en"
+                                    revtype="0" />
+
+    <ccm_cms.content_item_titles object_id="-600" 
+                                 locale="en" 
+                                 localized_value="Article 1" />
+
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-600"
+                                     localized_value="Article 1"
+                                     locale="en"
+                                     revtype="0" />
+    
+    <ccm_cms.content_type_labels object_id="-1200"
+                                 locale="en" 
+                                 localized_value="Article" />
+
+    <ccm_cms.articles object_id="-600" />
+    
+    <ccm_cms.article_texts 
+        object_id="-600"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-600" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
+        locale="en" 
+        revtype="0" />
+    
+    <ccm_core.categorizations categorization_id="-30100" 
+                              category_id="-200" 
+                              object_id="-600" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30200" 
+                              category_id="-400" 
+                              object_id="-700" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30300" 
+                              category_id="-400" 
+                              object_id="-800" 
+                              category_order="1" 
+                              object_order="3" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30400" 
+                              category_id="-400" 
+                              object_id="-900" 
+                              category_order="1" 
+                              object_order="4" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30600" 
+                              category_id="-400" 
+                              object_id="-1100" 
+                              category_order="1" 
+                              object_order="6" 
+                              category_index="false"
+                              type="folder" />
+    
+    <ccm_cms.attachment_lists list_id="-40100"
+                              name="images"
+                              list_order="1"
+                              uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
+                              item_id="-600" />
+    <ccm_cms.attachment_lists list_id="-40200"
+                              name="downloads"
+                              list_order="1"
+                              uuid="b39e4937-9f15-4b1f-9869-5a1107612e94"
+                              item_id="-600" />
+    
+    <ccm_cms.attachment_lists_aud list_id="-40100"
+                                  rev="0"
+                                  revtype="0"
+                                  name="images"
+                                  list_order="1"
+                                  uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
+                                  item_id="-600" />
+    <ccm_cms.attachment_lists_aud list_id="-40200"
+                                  rev="0"
+                                  revtype="0"
+                                  name="images"
+                                  list_order="1"
+                                  uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
+                                  item_id="-600" />
+    
+    <ccm_cms.attachments attachment_id="-50100"
+                         sort_key="1"
+                         uuid="eb7abe31-9b87-420b-8e5c-ca740b6e54d8"
+                         asset_id="-700"
+                         attachment_list_id="-40100" />
+    <ccm_cms.attachments attachment_id="-50200"
+                         sort_key="2"
+                         uuid="53e090c1-d7b8-4e86-881b-75d7d0bb5218"
+                         asset_id="-900"
+                         attachment_list_id="-40100" />
+    <ccm_cms.attachments attachment_id="-50300"
+                         sort_key="1"
+                         uuid="d1d56133-c139-4ee1-8f37-3a60c34b6dc4"
+                         asset_id="-1000"
+                         attachment_list_id="-40200" />
+    <ccm_cms.attachments attachment_id="-50400"
+                         sort_key="1"
+                         uuid="2ab364cf-28a9-4c3d-803c-a7742e7d49cd"
+                         asset_id="-1100"
+                         attachment_list_id="-40200" />
+    
+    <ccm_cms.attachments_aud attachment_id="-50100"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="eb7abe31-9b87-420b-8e5c-ca740b6e54d8"
+                             asset_id="-700"
+                             attachment_list_id="-40100" />
+    <ccm_cms.attachments_aud attachment_id="-50200"
+                             rev="0"
+                             revtype="0"
+                             sort_key="2"
+                             uuid="53e090c1-d7b8-4e86-881b-75d7d0bb5218"
+                             asset_id="-900"
+                             attachment_list_id="-40100" />
+    <ccm_cms.attachments_aud attachment_id="-50300"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="d1d56133-c139-4ee1-8f37-3a60c34b6dc4"
+                             asset_id="-1000"
+                             attachment_list_id="-40200" />
+    <ccm_cms.attachments_aud attachment_id="-50400"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="2ab364cf-28a9-4c3d-803c-a7742e7d49cd"
+                             asset_id="-1100"
+                             attachment_list_id="-40200" />
+
+        
+</dataset>

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

@@ -0,0 +1,562 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+
+    <!-- 
+        * 2 ContentSections with several asset folders
+        * CcmObject with existing AttachmentList
+        * several shared assets
+        
+    -->
+    
+    <ccm_core.ccm_revisions id="0"
+                            timestamp="1451602800" />
+    
+    <ccm_core.ccm_objects object_id="-100" 
+                          display_name="info"
+                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
+    <ccm_core.ccm_objects object_id="-200"
+                          display_name="info_root"
+                          uuid="82014239-9c06-486d-ae8c-4ae47f52a699" />
+    <ccm_core.ccm_objects object_id="-300"
+                          display_name="info_assets"
+                          uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    <ccm_core.ccm_objects object_id="-400"
+                          display_name="media"
+                          uuid="f8546369-4d06-47ea-9138-345d29ab8d68" />
+    <ccm_core.ccm_objects object_id="-500"
+                          display_name="data"
+                          uuid="18fbc7f4-ce7e-45d6-8dad-02887164b99d" />
+    <ccm_core.ccm_objects object_id="-600"
+                          display_name="article1"
+                          uuid="aed4b402-1180-46c6-b42d-7245f4dca248" />
+    <ccm_core.ccm_objects object_id="-700"
+                          display_name="header.png"
+                          uuid="4635589f-b87a-46d9-979e-6af14af063e5" />
+    <ccm_core.ccm_objects object_id="-800"
+                          display_name="the-phb.png"
+                          uuid="0a192e98-3b28-49d0-833f-bc9ff5f9d1d4" />
+    <ccm_core.ccm_objects object_id="-900"
+                          display_name="services-header.png"
+                          uuid="3fe13eb8-ec8d-4523-b42a-7fe1d5cf1a44" />
+    <ccm_core.ccm_objects object_id="-1000"
+                          display_name="product1-datasheet.pdf"
+                          uuid="0393840f-06a6-4ec3-aeb3-a612f845ad60" />
+    <ccm_core.ccm_objects object_id="-1100"
+                          display_name="catalog.pdf"
+                          uuid="cee702ad-79f7-4f78-b93d-46932d958c1c" />
+    <ccm_core.ccm_objects object_id="-1150"
+                          display_name="orphan.png"
+                          uuid="978849a8-6f2d-4746-bec0-05eccf53fc30" />
+    <ccm_core.ccm_objects object_id="-1200"
+                          display_name="org.librecms.contenttypes.Article"
+                          uuid="bd061ab6-9c4f-45ff-ab69-f521008eeac3" />
+    <ccm_core.ccm_objects object_id="-1300" 
+                          display_name="projects"
+                          uuid="2ac48bb5-a5fd-4e30-a80d-d895c2cad78a" />
+    <ccm_core.ccm_objects object_id="-1400"
+                          display_name="projects_root"
+                          uuid="fa88836d-3f3e-4197-949a-e9c697400bf0" />
+    <ccm_core.ccm_objects object_id="-1500"
+                          display_name="projects_assets"
+                          uuid="88c99d18-3a58-477b-89ea-e0ee6d1e4c56" />
+    <ccm_core.ccm_objects object_id="-1600"
+                          display_name="media"
+                          uuid="ec3f0d51-5d9b-440e-bb5a-5fac7da94af1" />
+    <ccm_core.ccm_objects object_id="-1700"
+                          display_name="data"
+                          uuid="80086df3-d682-42bb-9939-8cc04a300575" />
+    
+    <ccm_core.ccm_objects_aud object_id="-600"
+                              rev="0"
+                              revtype="0"
+                              display_name="article1" />
+    <ccm_core.ccm_objects_aud object_id="-700"
+                              rev="0"
+                              revtype="0"
+                              display_name="header.png" />
+    <ccm_core.ccm_objects_aud object_id="-800"
+                              rev="0"
+                              revtype="0"
+                              display_name="the-phb.png" />
+    <ccm_core.ccm_objects_aud object_id="-900"
+                              rev="0"
+                              revtype="0"
+                              display_name="services-header.png" />
+    <ccm_core.ccm_objects_aud object_id="-1000"
+                              rev="0"
+                              revtype="0"
+                              display_name="product1-datasheet.pdf" />
+    <ccm_core.ccm_objects_aud object_id="-1100"
+                              rev="0"
+                              revtype="0"
+                              display_name="catalog.pdf" />
+    <ccm_core.ccm_objects_aud object_id="-1150"
+                              rev="0"
+                              revtype="0"
+                              display_name="orphan.png" />
+
+    <ccm_core.categories object_id="-200" 
+                         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="-300"
+                         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="-400"
+                         unique_id="f8546369-4d06-47ea-9138-345d29ab8d68" 
+                         name="media" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1"/>
+    <ccm_core.categories object_id="-500" 
+                         unique_id="18fbc7f4-ce7e-45d6-8dad-02887164b99d" 
+                         name="data" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1"/>
+    <ccm_core.categories object_id="-1400" 
+                         unique_id="fa88836d-3f3e-4197-949a-e9c697400bf0" 
+                         name="projects_root"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-1500" 
+                         unique_id="88c99d18-3a58-477b-89ea-e0ee6d1e4c56" 
+                         name="projects_assets"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-1600" 
+                         unique_id="ec3f0d51-5d9b-440e-bb5a-5fac7da94af1" 
+                         name="media"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1"    />
+    <ccm_core.categories object_id="-1700" 
+                         unique_id="80086df3-d682-42bb-9939-8cc04a300575"
+                         name="data"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1"    />
+
+    <ccm_core.category_titles object_id="-200"
+                              locale="en"
+                              localized_value="info_root" />
+    <ccm_core.category_titles object_id="-300"
+                              locale="en"
+                              localized_value="info_assets" />
+    <ccm_core.category_titles object_id="-400"
+                              locale="en"
+                              localized_value="media" />
+    <ccm_core.category_titles object_id="-500"
+                              locale="en"
+                              localized_value="data" />
+    <ccm_core.category_titles object_id="-1400"
+                              locale="en"
+                              localized_value="projects_root" />
+    <ccm_core.category_titles object_id="-1500"
+                              locale="en"
+                              localized_value="projects_assets" />
+    <ccm_core.category_titles object_id="-1600"
+                              locale="en"
+                              localized_value="media" />
+    <ccm_core.category_titles object_id="-1700"
+                              locale="en"
+                              localized_value="data" />
+    
+    
+    <ccm_core.resources object_id="-100" 
+                        created="2016-07-15" />
+    <ccm_core.resources object_id="-1300" 
+                        created="2016-07-15" />
+
+    <ccm_core.applications object_id="-100"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="info" />
+    <ccm_core.applications object_id="-1300"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="projects" />
+
+    <ccm_cms.folders object_id="-200"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-300"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-400"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-500"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-1400"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-1500"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-1600"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-1700"
+                     type="ASSETS_FOLDER" />
+    
+    <ccm_cms.content_sections object_id="-100"
+                              label="info"
+                              root_documents_folder_id="-200"
+                              root_assets_folder_id="-300" />
+    <ccm_cms.content_sections object_id="-1300"
+                              label="projects"
+                              root_documents_folder_id="-1400"
+                              root_assets_folder_id="-1500" />
+
+    <ccm_cms.folder_content_section_map folder_id="-200" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-300" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-400" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-500" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-1400" 
+                                        content_section_id="-1300" />
+    <ccm_cms.folder_content_section_map folder_id="-1500" 
+                                        content_section_id="-1300" />
+    <ccm_cms.folder_content_section_map folder_id="-1600" 
+                                        content_section_id="-1300" />
+    <ccm_cms.folder_content_section_map folder_id="-1700" 
+                                        content_section_id="-1300" />
+    
+    <ccm_cms.content_types object_id="-1200" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-100" />
+
+    <ccm_cms.content_items object_id="-600" 
+                           item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248"
+                           version="DRAFT"
+                           content_type_id="-1200" />
+    
+    <ccm_cms.assets object_id="-700" />
+    <ccm_cms.assets object_id="-800" />
+    <ccm_cms.assets object_id="-900" />
+    <ccm_cms.assets object_id="-1000" />
+    <ccm_cms.assets object_id="-1100" />
+    <ccm_cms.assets object_id="-1150" />
+    
+    <ccm_cms.assets_aud object_id="-700" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-800" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-900" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-1000" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-1100" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-1150" 
+                        rev="0" />
+    
+    <ccm_cms.asset_titles asset_id="-700" 
+                          localized_value="header.png" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-800" 
+                          localized_value="the-phb.png" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-900" 
+                          localized_value="services-header.png" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-1000" 
+                          localized_value="product1-datasheet.pdf" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-1100" 
+                          localized_value="catelog.pdf" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-1150" 
+                          localized_value="orphan.pdf" 
+                          locale="en" />
+    
+    <ccm_cms.binary_assets object_id="-700" 
+                           filename="header.png" 
+                           mime_type="image/png" 
+                           data_size="0" />
+    <ccm_cms.binary_assets object_id="-800" 
+                           filename="the-phb.png" 
+                           mime_type="image/png" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-900" 
+                           filename="services-header.png" 
+                           mime_type="image/png" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1000" 
+                           filename="product1-datasheet.pdf"
+                           mime_type="application/pdf" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1100" 
+                           filename="catalog.pdf" 
+                           mime_type="application/pdf" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1150" 
+                           filename="orphan.png" 
+                           mime_type="image/png" 
+                           data_size="0"/>
+    
+    <ccm_cms.binary_assets_aud object_id="-700" 
+                               rev="0"
+                               filename="header.png" 
+                               mime_type="image/png" 
+                               data_size="0"/>
+    <ccm_cms.binary_assets_aud object_id="-800" 
+                               rev="0"
+                               filename="the-phb.png" 
+                               mime_type="image/png" 
+                               data_size="0"/>
+    <ccm_cms.binary_assets_aud object_id="-900" 
+                               rev="0"
+                               filename="services-header.png" 
+                               mime_type="image/png" 
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-1000" 
+                               rev="0"
+                               filename="product1-datasheet.pdf"
+                               mime_type="application/pdf"
+                               data_size="0"    />
+    <ccm_cms.binary_assets_aud object_id="-1100" 
+                               rev="0"
+                               filename="catalog.pdf" 
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-1150" 
+                               rev="0"
+                               filename="orphan.png" 
+                               mime_type="image/png"
+                               data_size="0" />
+    
+    <ccm_cms.images object_id="-700" 
+                    height="0"
+                    width="0" />
+    <ccm_cms.images object_id="-800"
+                    height="0"
+                    width="0" />
+    <ccm_cms.images object_id="-900"
+                    height="0"
+                    width="0" />
+    <ccm_cms.images object_id="-1150"
+                    height="0"
+                    width="0" />
+    
+    <ccm_cms.images_aud object_id="-700" 
+                        rev="0" 
+                        height="0"
+                        width="0" />
+    <ccm_cms.images_aud object_id="-800" 
+                        rev="0"
+                        height="0"
+                        width="0" />
+    <ccm_cms.images_aud object_id="-900" 
+                        rev="0"
+                        height="0"
+                        width="0" />
+    <ccm_cms.images_aud object_id="-1150" 
+                        rev="0"
+                        height="0"
+                        width="0" />
+    
+    <ccm_cms.files object_id="-1000" />
+    <ccm_cms.files object_id="-1100" />
+    
+    <ccm_cms.files_aud object_id="-1000" 
+                       rev="0" />
+    <ccm_cms.files_aud object_id="-1100" 
+                       rev="0" />
+    
+    <ccm_cms.asset_titles_aud asset_id="-700" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="header.png" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-800" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="the-phb.png" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-900" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="services-header.png" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-1000" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="product1-datasheet.pdf" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-1100" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="catelog.pdf" 
+                              locale="en" />
+
+    
+    <ccm_cms.content_items_aud object_id="-600" 
+                               rev="0"
+                               item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248" 
+                               version="DRAFT" 
+                               content_type_id="-1200" />
+
+    <ccm_cms.content_item_names object_id="-600" 
+                                locale="en" 
+                                localized_value="article1" />
+
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-600"
+                                    localized_value="article1"
+                                    locale="en"
+                                    revtype="0" />
+
+    <ccm_cms.content_item_titles object_id="-600" 
+                                 locale="en" 
+                                 localized_value="Article 1" />
+
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-600"
+                                     localized_value="Article 1"
+                                     locale="en"
+                                     revtype="0" />
+    
+    <ccm_cms.content_type_labels object_id="-1200"
+                                 locale="en" 
+                                 localized_value="Article" />
+
+    <ccm_cms.articles object_id="-600" />
+    
+    <ccm_cms.article_texts 
+        object_id="-600"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-600" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
+        locale="en" 
+        revtype="0" />
+    
+    <ccm_core.categorizations categorization_id="-30100" 
+                              category_id="-200" 
+                              object_id="-600" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30200" 
+                              category_id="-400" 
+                              object_id="-700" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30300" 
+                              category_id="-400" 
+                              object_id="-800" 
+                              category_order="1" 
+                              object_order="3" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30400" 
+                              category_id="-400" 
+                              object_id="-900" 
+                              category_order="1" 
+                              object_order="4" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30600" 
+                              category_id="-400" 
+                              object_id="-1100" 
+                              category_order="1" 
+                              object_order="6" 
+                              category_index="false"
+                              type="folder" />
+    
+    <ccm_cms.attachment_lists list_id="-40100"
+                              name="images"
+                              list_order="1"
+                              uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
+                              item_id="-600" />
+    <ccm_cms.attachment_lists list_id="-40200"
+                              name="downloads"
+                              list_order="1"
+                              uuid="b39e4937-9f15-4b1f-9869-5a1107612e94"
+                              item_id="-600" />
+    
+    <ccm_cms.attachment_lists_aud list_id="-40100"
+                                  rev="0"
+                                  revtype="0"
+                                  name="images"
+                                  list_order="1"
+                                  uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
+                                  item_id="-600" />
+    <ccm_cms.attachment_lists_aud list_id="-40200"
+                                  rev="0"
+                                  revtype="0"
+                                  name="images"
+                                  list_order="1"
+                                  uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
+                                  item_id="-600" />
+    
+    <ccm_cms.attachments attachment_id="-50100"
+                         sort_key="1"
+                         uuid="eb7abe31-9b87-420b-8e5c-ca740b6e54d8"
+                         asset_id="-700"
+                         attachment_list_id="-40100" />
+    <ccm_cms.attachments attachment_id="-50200"
+                         sort_key="2"
+                         uuid="53e090c1-d7b8-4e86-881b-75d7d0bb5218"
+                         asset_id="-900"
+                         attachment_list_id="-40100" />
+    <ccm_cms.attachments attachment_id="-50300"
+                         sort_key="1"
+                         uuid="d1d56133-c139-4ee1-8f37-3a60c34b6dc4"
+                         asset_id="-1000"
+                         attachment_list_id="-40200" />
+    <ccm_cms.attachments attachment_id="-50400"
+                         sort_key="1"
+                         uuid="2ab364cf-28a9-4c3d-803c-a7742e7d49cd"
+                         asset_id="-1100"
+                         attachment_list_id="-40200" />
+    
+    <ccm_cms.attachments_aud attachment_id="-50100"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="eb7abe31-9b87-420b-8e5c-ca740b6e54d8"
+                             asset_id="-700"
+                             attachment_list_id="-40100" />
+    <ccm_cms.attachments_aud attachment_id="-50200"
+                             rev="0"
+                             revtype="0"
+                             sort_key="2"
+                             uuid="53e090c1-d7b8-4e86-881b-75d7d0bb5218"
+                             asset_id="-900"
+                             attachment_list_id="-40100" />
+    <ccm_cms.attachments_aud attachment_id="-50300"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="d1d56133-c139-4ee1-8f37-3a60c34b6dc4"
+                             asset_id="-1000"
+                             attachment_list_id="-40200" />
+    <ccm_cms.attachments_aud attachment_id="-50400"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="2ab364cf-28a9-4c3d-803c-a7742e7d49cd"
+                             asset_id="-1100"
+                             attachment_list_id="-40200" />
+
+        
+</dataset>

ccm-cms/src/test/resources/datasets/org/librecms/assets/AssetManagerTest/after-create-nonshared.xml

@@ -0,0 +1,562 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+
+    <!-- 
+        * 2 ContentSections with several asset folders
+        * CcmObject with existing AttachmentList
+        * several shared assets
+        
+    -->
+    
+    <ccm_core.ccm_revisions id="0"
+                            timestamp="1451602800" />
+    
+    <ccm_core.ccm_objects object_id="-100" 
+                          display_name="info"
+                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
+    <ccm_core.ccm_objects object_id="-200"
+                          display_name="info_root"
+                          uuid="82014239-9c06-486d-ae8c-4ae47f52a699" />
+    <ccm_core.ccm_objects object_id="-300"
+                          display_name="info_assets"
+                          uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    <ccm_core.ccm_objects object_id="-400"
+                          display_name="media"
+                          uuid="f8546369-4d06-47ea-9138-345d29ab8d68" />
+    <ccm_core.ccm_objects object_id="-500"
+                          display_name="data"
+                          uuid="18fbc7f4-ce7e-45d6-8dad-02887164b99d" />
+    <ccm_core.ccm_objects object_id="-600"
+                          display_name="article1"
+                          uuid="aed4b402-1180-46c6-b42d-7245f4dca248" />
+    <ccm_core.ccm_objects object_id="-700"
+                          display_name="header.png"
+                          uuid="4635589f-b87a-46d9-979e-6af14af063e5" />
+    <ccm_core.ccm_objects object_id="-800"
+                          display_name="the-phb.png"
+                          uuid="0a192e98-3b28-49d0-833f-bc9ff5f9d1d4" />
+    <ccm_core.ccm_objects object_id="-900"
+                          display_name="services-header.png"
+                          uuid="3fe13eb8-ec8d-4523-b42a-7fe1d5cf1a44" />
+    <ccm_core.ccm_objects object_id="-1000"
+                          display_name="product1-datasheet.pdf"
+                          uuid="0393840f-06a6-4ec3-aeb3-a612f845ad60" />
+    <ccm_core.ccm_objects object_id="-1100"
+                          display_name="catalog.pdf"
+                          uuid="cee702ad-79f7-4f78-b93d-46932d958c1c" />
+    <ccm_core.ccm_objects object_id="-1150"
+                          display_name="orphan.png"
+                          uuid="978849a8-6f2d-4746-bec0-05eccf53fc30" />
+    <ccm_core.ccm_objects object_id="-1200"
+                          display_name="org.librecms.contenttypes.Article"
+                          uuid="bd061ab6-9c4f-45ff-ab69-f521008eeac3" />
+    <ccm_core.ccm_objects object_id="-1300" 
+                          display_name="projects"
+                          uuid="2ac48bb5-a5fd-4e30-a80d-d895c2cad78a" />
+    <ccm_core.ccm_objects object_id="-1400"
+                          display_name="projects_root"
+                          uuid="fa88836d-3f3e-4197-949a-e9c697400bf0" />
+    <ccm_core.ccm_objects object_id="-1500"
+                          display_name="projects_assets"
+                          uuid="88c99d18-3a58-477b-89ea-e0ee6d1e4c56" />
+    <ccm_core.ccm_objects object_id="-1600"
+                          display_name="media"
+                          uuid="ec3f0d51-5d9b-440e-bb5a-5fac7da94af1" />
+    <ccm_core.ccm_objects object_id="-1700"
+                          display_name="data"
+                          uuid="80086df3-d682-42bb-9939-8cc04a300575" />
+    
+    <ccm_core.ccm_objects_aud object_id="-600"
+                              rev="0"
+                              revtype="0"
+                              display_name="article1" />
+    <ccm_core.ccm_objects_aud object_id="-700"
+                              rev="0"
+                              revtype="0"
+                              display_name="header.png" />
+    <ccm_core.ccm_objects_aud object_id="-800"
+                              rev="0"
+                              revtype="0"
+                              display_name="the-phb.png" />
+    <ccm_core.ccm_objects_aud object_id="-900"
+                              rev="0"
+                              revtype="0"
+                              display_name="services-header.png" />
+    <ccm_core.ccm_objects_aud object_id="-1000"
+                              rev="0"
+                              revtype="0"
+                              display_name="product1-datasheet.pdf" />
+    <ccm_core.ccm_objects_aud object_id="-1100"
+                              rev="0"
+                              revtype="0"
+                              display_name="catalog.pdf" />
+    <ccm_core.ccm_objects_aud object_id="-1150"
+                              rev="0"
+                              revtype="0"
+                              display_name="orphan.png" />
+
+    <ccm_core.categories object_id="-200" 
+                         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="-300"
+                         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="-400"
+                         unique_id="f8546369-4d06-47ea-9138-345d29ab8d68" 
+                         name="media" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1"/>
+    <ccm_core.categories object_id="-500" 
+                         unique_id="18fbc7f4-ce7e-45d6-8dad-02887164b99d" 
+                         name="data" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1"/>
+    <ccm_core.categories object_id="-1400" 
+                         unique_id="fa88836d-3f3e-4197-949a-e9c697400bf0" 
+                         name="projects_root"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-1500" 
+                         unique_id="88c99d18-3a58-477b-89ea-e0ee6d1e4c56" 
+                         name="projects_assets"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-1600" 
+                         unique_id="ec3f0d51-5d9b-440e-bb5a-5fac7da94af1" 
+                         name="media"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1"    />
+    <ccm_core.categories object_id="-1700" 
+                         unique_id="80086df3-d682-42bb-9939-8cc04a300575"
+                         name="data"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1"    />
+
+    <ccm_core.category_titles object_id="-200"
+                              locale="en"
+                              localized_value="info_root" />
+    <ccm_core.category_titles object_id="-300"
+                              locale="en"
+                              localized_value="info_assets" />
+    <ccm_core.category_titles object_id="-400"
+                              locale="en"
+                              localized_value="media" />
+    <ccm_core.category_titles object_id="-500"
+                              locale="en"
+                              localized_value="data" />
+    <ccm_core.category_titles object_id="-1400"
+                              locale="en"
+                              localized_value="projects_root" />
+    <ccm_core.category_titles object_id="-1500"
+                              locale="en"
+                              localized_value="projects_assets" />
+    <ccm_core.category_titles object_id="-1600"
+                              locale="en"
+                              localized_value="media" />
+    <ccm_core.category_titles object_id="-1700"
+                              locale="en"
+                              localized_value="data" />
+    
+    
+    <ccm_core.resources object_id="-100" 
+                        created="2016-07-15" />
+    <ccm_core.resources object_id="-1300" 
+                        created="2016-07-15" />
+
+    <ccm_core.applications object_id="-100"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="info" />
+    <ccm_core.applications object_id="-1300"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="projects" />
+
+    <ccm_cms.folders object_id="-200"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-300"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-400"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-500"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-1400"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-1500"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-1600"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-1700"
+                     type="ASSETS_FOLDER" />
+    
+    <ccm_cms.content_sections object_id="-100"
+                              label="info"
+                              root_documents_folder_id="-200"
+                              root_assets_folder_id="-300" />
+    <ccm_cms.content_sections object_id="-1300"
+                              label="projects"
+                              root_documents_folder_id="-1400"
+                              root_assets_folder_id="-1500" />
+
+    <ccm_cms.folder_content_section_map folder_id="-200" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-300" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-400" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-500" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-1400" 
+                                        content_section_id="-1300" />
+    <ccm_cms.folder_content_section_map folder_id="-1500" 
+                                        content_section_id="-1300" />
+    <ccm_cms.folder_content_section_map folder_id="-1600" 
+                                        content_section_id="-1300" />
+    <ccm_cms.folder_content_section_map folder_id="-1700" 
+                                        content_section_id="-1300" />
+    
+    <ccm_cms.content_types object_id="-1200" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-100" />
+
+    <ccm_cms.content_items object_id="-600" 
+                           item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248"
+                           version="DRAFT"
+                           content_type_id="-1200" />
+    
+    <ccm_cms.assets object_id="-700" />
+    <ccm_cms.assets object_id="-800" />
+    <ccm_cms.assets object_id="-900" />
+    <ccm_cms.assets object_id="-1000" />
+    <ccm_cms.assets object_id="-1100" />
+    <ccm_cms.assets object_id="-1150" />
+    
+    <ccm_cms.assets_aud object_id="-700" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-800" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-900" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-1000" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-1100" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-1150" 
+                        rev="0" />
+    
+    <ccm_cms.asset_titles asset_id="-700" 
+                          localized_value="header.png" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-800" 
+                          localized_value="the-phb.png" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-900" 
+                          localized_value="services-header.png" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-1000" 
+                          localized_value="product1-datasheet.pdf" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-1100" 
+                          localized_value="catelog.pdf" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-1150" 
+                          localized_value="orphan.pdf" 
+                          locale="en" />
+    
+    <ccm_cms.binary_assets object_id="-700" 
+                           filename="header.png" 
+                           mime_type="image/png" 
+                           data_size="0" />
+    <ccm_cms.binary_assets object_id="-800" 
+                           filename="the-phb.png" 
+                           mime_type="image/png" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-900" 
+                           filename="services-header.png" 
+                           mime_type="image/png" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1000" 
+                           filename="product1-datasheet.pdf"
+                           mime_type="application/pdf" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1100" 
+                           filename="catalog.pdf" 
+                           mime_type="application/pdf" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1150" 
+                           filename="orphan.png" 
+                           mime_type="image/png" 
+                           data_size="0"/>
+    
+    <ccm_cms.binary_assets_aud object_id="-700" 
+                               rev="0"
+                               filename="header.png" 
+                               mime_type="image/png" 
+                               data_size="0"/>
+    <ccm_cms.binary_assets_aud object_id="-800" 
+                               rev="0"
+                               filename="the-phb.png" 
+                               mime_type="image/png" 
+                               data_size="0"/>
+    <ccm_cms.binary_assets_aud object_id="-900" 
+                               rev="0"
+                               filename="services-header.png" 
+                               mime_type="image/png" 
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-1000" 
+                               rev="0"
+                               filename="product1-datasheet.pdf"
+                               mime_type="application/pdf"
+                               data_size="0"    />
+    <ccm_cms.binary_assets_aud object_id="-1100" 
+                               rev="0"
+                               filename="catalog.pdf" 
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-1150" 
+                               rev="0"
+                               filename="orphan.png" 
+                               mime_type="image/png"
+                               data_size="0" />
+    
+    <ccm_cms.images object_id="-700" 
+                    height="0"
+                    width="0" />
+    <ccm_cms.images object_id="-800"
+                    height="0"
+                    width="0" />
+    <ccm_cms.images object_id="-900"
+                    height="0"
+                    width="0" />
+    <ccm_cms.images object_id="-1150"
+                    height="0"
+                    width="0" />
+    
+    <ccm_cms.images_aud object_id="-700" 
+                        rev="0" 
+                        height="0"
+                        width="0" />
+    <ccm_cms.images_aud object_id="-800" 
+                        rev="0"
+                        height="0"
+                        width="0" />
+    <ccm_cms.images_aud object_id="-900" 
+                        rev="0"
+                        height="0"
+                        width="0" />
+    <ccm_cms.images_aud object_id="-1150" 
+                        rev="0"
+                        height="0"
+                        width="0" />
+    
+    <ccm_cms.files object_id="-1000" />
+    <ccm_cms.files object_id="-1100" />
+    
+    <ccm_cms.files_aud object_id="-1000" 
+                       rev="0" />
+    <ccm_cms.files_aud object_id="-1100" 
+                       rev="0" />
+    
+    <ccm_cms.asset_titles_aud asset_id="-700" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="header.png" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-800" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="the-phb.png" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-900" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="services-header.png" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-1000" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="product1-datasheet.pdf" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-1100" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="catelog.pdf" 
+                              locale="en" />
+
+    
+    <ccm_cms.content_items_aud object_id="-600" 
+                               rev="0"
+                               item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248" 
+                               version="DRAFT" 
+                               content_type_id="-1200" />
+
+    <ccm_cms.content_item_names object_id="-600" 
+                                locale="en" 
+                                localized_value="article1" />
+
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-600"
+                                    localized_value="article1"
+                                    locale="en"
+                                    revtype="0" />
+
+    <ccm_cms.content_item_titles object_id="-600" 
+                                 locale="en" 
+                                 localized_value="Article 1" />
+
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-600"
+                                     localized_value="Article 1"
+                                     locale="en"
+                                     revtype="0" />
+    
+    <ccm_cms.content_type_labels object_id="-1200"
+                                 locale="en" 
+                                 localized_value="Article" />
+
+    <ccm_cms.articles object_id="-600" />
+    
+    <ccm_cms.article_texts 
+        object_id="-600"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-600" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
+        locale="en" 
+        revtype="0" />
+    
+    <ccm_core.categorizations categorization_id="-30100" 
+                              category_id="-200" 
+                              object_id="-600" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30200" 
+                              category_id="-400" 
+                              object_id="-700" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30300" 
+                              category_id="-400" 
+                              object_id="-800" 
+                              category_order="1" 
+                              object_order="3" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30400" 
+                              category_id="-400" 
+                              object_id="-900" 
+                              category_order="1" 
+                              object_order="4" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30600" 
+                              category_id="-400" 
+                              object_id="-1100" 
+                              category_order="1" 
+                              object_order="6" 
+                              category_index="false"
+                              type="folder" />
+    
+    <ccm_cms.attachment_lists list_id="-40100"
+                              name="images"
+                              list_order="1"
+                              uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
+                              item_id="-600" />
+    <ccm_cms.attachment_lists list_id="-40200"
+                              name="downloads"
+                              list_order="1"
+                              uuid="b39e4937-9f15-4b1f-9869-5a1107612e94"
+                              item_id="-600" />
+    
+    <ccm_cms.attachment_lists_aud list_id="-40100"
+                                  rev="0"
+                                  revtype="0"
+                                  name="images"
+                                  list_order="1"
+                                  uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
+                                  item_id="-600" />
+    <ccm_cms.attachment_lists_aud list_id="-40200"
+                                  rev="0"
+                                  revtype="0"
+                                  name="images"
+                                  list_order="1"
+                                  uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
+                                  item_id="-600" />
+    
+    <ccm_cms.attachments attachment_id="-50100"
+                         sort_key="1"
+                         uuid="eb7abe31-9b87-420b-8e5c-ca740b6e54d8"
+                         asset_id="-700"
+                         attachment_list_id="-40100" />
+    <ccm_cms.attachments attachment_id="-50200"
+                         sort_key="2"
+                         uuid="53e090c1-d7b8-4e86-881b-75d7d0bb5218"
+                         asset_id="-900"
+                         attachment_list_id="-40100" />
+    <ccm_cms.attachments attachment_id="-50300"
+                         sort_key="1"
+                         uuid="d1d56133-c139-4ee1-8f37-3a60c34b6dc4"
+                         asset_id="-1000"
+                         attachment_list_id="-40200" />
+    <ccm_cms.attachments attachment_id="-50400"
+                         sort_key="1"
+                         uuid="2ab364cf-28a9-4c3d-803c-a7742e7d49cd"
+                         asset_id="-1100"
+                         attachment_list_id="-40200" />
+    
+    <ccm_cms.attachments_aud attachment_id="-50100"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="eb7abe31-9b87-420b-8e5c-ca740b6e54d8"
+                             asset_id="-700"
+                             attachment_list_id="-40100" />
+    <ccm_cms.attachments_aud attachment_id="-50200"
+                             rev="0"
+                             revtype="0"
+                             sort_key="2"
+                             uuid="53e090c1-d7b8-4e86-881b-75d7d0bb5218"
+                             asset_id="-900"
+                             attachment_list_id="-40100" />
+    <ccm_cms.attachments_aud attachment_id="-50300"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="d1d56133-c139-4ee1-8f37-3a60c34b6dc4"
+                             asset_id="-1000"
+                             attachment_list_id="-40200" />
+    <ccm_cms.attachments_aud attachment_id="-50400"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="2ab364cf-28a9-4c3d-803c-a7742e7d49cd"
+                             asset_id="-1100"
+                             attachment_list_id="-40200" />
+
+        
+</dataset>

ccm-cms/src/test/resources/datasets/org/librecms/assets/AssetManagerTest/after-create-shared.xml

@@ -0,0 +1,562 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+
+    <!-- 
+        * 2 ContentSections with several asset folders
+        * CcmObject with existing AttachmentList
+        * several shared assets
+        
+    -->
+    
+    <ccm_core.ccm_revisions id="0"
+                            timestamp="1451602800" />
+    
+    <ccm_core.ccm_objects object_id="-100" 
+                          display_name="info"
+                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
+    <ccm_core.ccm_objects object_id="-200"
+                          display_name="info_root"
+                          uuid="82014239-9c06-486d-ae8c-4ae47f52a699" />
+    <ccm_core.ccm_objects object_id="-300"
+                          display_name="info_assets"
+                          uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    <ccm_core.ccm_objects object_id="-400"
+                          display_name="media"
+                          uuid="f8546369-4d06-47ea-9138-345d29ab8d68" />
+    <ccm_core.ccm_objects object_id="-500"
+                          display_name="data"
+                          uuid="18fbc7f4-ce7e-45d6-8dad-02887164b99d" />
+    <ccm_core.ccm_objects object_id="-600"
+                          display_name="article1"
+                          uuid="aed4b402-1180-46c6-b42d-7245f4dca248" />
+    <ccm_core.ccm_objects object_id="-700"
+                          display_name="header.png"
+                          uuid="4635589f-b87a-46d9-979e-6af14af063e5" />
+    <ccm_core.ccm_objects object_id="-800"
+                          display_name="the-phb.png"
+                          uuid="0a192e98-3b28-49d0-833f-bc9ff5f9d1d4" />
+    <ccm_core.ccm_objects object_id="-900"
+                          display_name="services-header.png"
+                          uuid="3fe13eb8-ec8d-4523-b42a-7fe1d5cf1a44" />
+    <ccm_core.ccm_objects object_id="-1000"
+                          display_name="product1-datasheet.pdf"
+                          uuid="0393840f-06a6-4ec3-aeb3-a612f845ad60" />
+    <ccm_core.ccm_objects object_id="-1100"
+                          display_name="catalog.pdf"
+                          uuid="cee702ad-79f7-4f78-b93d-46932d958c1c" />
+    <ccm_core.ccm_objects object_id="-1150"
+                          display_name="orphan.png"
+                          uuid="978849a8-6f2d-4746-bec0-05eccf53fc30" />
+    <ccm_core.ccm_objects object_id="-1200"
+                          display_name="org.librecms.contenttypes.Article"
+                          uuid="bd061ab6-9c4f-45ff-ab69-f521008eeac3" />
+    <ccm_core.ccm_objects object_id="-1300" 
+                          display_name="projects"
+                          uuid="2ac48bb5-a5fd-4e30-a80d-d895c2cad78a" />
+    <ccm_core.ccm_objects object_id="-1400"
+                          display_name="projects_root"
+                          uuid="fa88836d-3f3e-4197-949a-e9c697400bf0" />
+    <ccm_core.ccm_objects object_id="-1500"
+                          display_name="projects_assets"
+                          uuid="88c99d18-3a58-477b-89ea-e0ee6d1e4c56" />
+    <ccm_core.ccm_objects object_id="-1600"
+                          display_name="media"
+                          uuid="ec3f0d51-5d9b-440e-bb5a-5fac7da94af1" />
+    <ccm_core.ccm_objects object_id="-1700"
+                          display_name="data"
+                          uuid="80086df3-d682-42bb-9939-8cc04a300575" />
+    
+    <ccm_core.ccm_objects_aud object_id="-600"
+                              rev="0"
+                              revtype="0"
+                              display_name="article1" />
+    <ccm_core.ccm_objects_aud object_id="-700"
+                              rev="0"
+                              revtype="0"
+                              display_name="header.png" />
+    <ccm_core.ccm_objects_aud object_id="-800"
+                              rev="0"
+                              revtype="0"
+                              display_name="the-phb.png" />
+    <ccm_core.ccm_objects_aud object_id="-900"
+                              rev="0"
+                              revtype="0"
+                              display_name="services-header.png" />
+    <ccm_core.ccm_objects_aud object_id="-1000"
+                              rev="0"
+                              revtype="0"
+                              display_name="product1-datasheet.pdf" />
+    <ccm_core.ccm_objects_aud object_id="-1100"
+                              rev="0"
+                              revtype="0"
+                              display_name="catalog.pdf" />
+    <ccm_core.ccm_objects_aud object_id="-1150"
+                              rev="0"
+                              revtype="0"
+                              display_name="orphan.png" />
+
+    <ccm_core.categories object_id="-200" 
+                         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="-300"
+                         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="-400"
+                         unique_id="f8546369-4d06-47ea-9138-345d29ab8d68" 
+                         name="media" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1"/>
+    <ccm_core.categories object_id="-500" 
+                         unique_id="18fbc7f4-ce7e-45d6-8dad-02887164b99d" 
+                         name="data" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1"/>
+    <ccm_core.categories object_id="-1400" 
+                         unique_id="fa88836d-3f3e-4197-949a-e9c697400bf0" 
+                         name="projects_root"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-1500" 
+                         unique_id="88c99d18-3a58-477b-89ea-e0ee6d1e4c56" 
+                         name="projects_assets"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-1600" 
+                         unique_id="ec3f0d51-5d9b-440e-bb5a-5fac7da94af1" 
+                         name="media"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1"    />
+    <ccm_core.categories object_id="-1700" 
+                         unique_id="80086df3-d682-42bb-9939-8cc04a300575"
+                         name="data"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1"    />
+
+    <ccm_core.category_titles object_id="-200"
+                              locale="en"
+                              localized_value="info_root" />
+    <ccm_core.category_titles object_id="-300"
+                              locale="en"
+                              localized_value="info_assets" />
+    <ccm_core.category_titles object_id="-400"
+                              locale="en"
+                              localized_value="media" />
+    <ccm_core.category_titles object_id="-500"
+                              locale="en"
+                              localized_value="data" />
+    <ccm_core.category_titles object_id="-1400"
+                              locale="en"
+                              localized_value="projects_root" />
+    <ccm_core.category_titles object_id="-1500"
+                              locale="en"
+                              localized_value="projects_assets" />
+    <ccm_core.category_titles object_id="-1600"
+                              locale="en"
+                              localized_value="media" />
+    <ccm_core.category_titles object_id="-1700"
+                              locale="en"
+                              localized_value="data" />
+    
+    
+    <ccm_core.resources object_id="-100" 
+                        created="2016-07-15" />
+    <ccm_core.resources object_id="-1300" 
+                        created="2016-07-15" />
+
+    <ccm_core.applications object_id="-100"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="info" />
+    <ccm_core.applications object_id="-1300"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="projects" />
+
+    <ccm_cms.folders object_id="-200"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-300"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-400"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-500"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-1400"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-1500"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-1600"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-1700"
+                     type="ASSETS_FOLDER" />
+    
+    <ccm_cms.content_sections object_id="-100"
+                              label="info"
+                              root_documents_folder_id="-200"
+                              root_assets_folder_id="-300" />
+    <ccm_cms.content_sections object_id="-1300"
+                              label="projects"
+                              root_documents_folder_id="-1400"
+                              root_assets_folder_id="-1500" />
+
+    <ccm_cms.folder_content_section_map folder_id="-200" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-300" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-400" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-500" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-1400" 
+                                        content_section_id="-1300" />
+    <ccm_cms.folder_content_section_map folder_id="-1500" 
+                                        content_section_id="-1300" />
+    <ccm_cms.folder_content_section_map folder_id="-1600" 
+                                        content_section_id="-1300" />
+    <ccm_cms.folder_content_section_map folder_id="-1700" 
+                                        content_section_id="-1300" />
+    
+    <ccm_cms.content_types object_id="-1200" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-100" />
+
+    <ccm_cms.content_items object_id="-600" 
+                           item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248"
+                           version="DRAFT"
+                           content_type_id="-1200" />
+    
+    <ccm_cms.assets object_id="-700" />
+    <ccm_cms.assets object_id="-800" />
+    <ccm_cms.assets object_id="-900" />
+    <ccm_cms.assets object_id="-1000" />
+    <ccm_cms.assets object_id="-1100" />
+    <ccm_cms.assets object_id="-1150" />
+    
+    <ccm_cms.assets_aud object_id="-700" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-800" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-900" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-1000" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-1100" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-1150" 
+                        rev="0" />
+    
+    <ccm_cms.asset_titles asset_id="-700" 
+                          localized_value="header.png" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-800" 
+                          localized_value="the-phb.png" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-900" 
+                          localized_value="services-header.png" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-1000" 
+                          localized_value="product1-datasheet.pdf" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-1100" 
+                          localized_value="catelog.pdf" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-1150" 
+                          localized_value="orphan.pdf" 
+                          locale="en" />
+    
+    <ccm_cms.binary_assets object_id="-700" 
+                           filename="header.png" 
+                           mime_type="image/png" 
+                           data_size="0" />
+    <ccm_cms.binary_assets object_id="-800" 
+                           filename="the-phb.png" 
+                           mime_type="image/png" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-900" 
+                           filename="services-header.png" 
+                           mime_type="image/png" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1000" 
+                           filename="product1-datasheet.pdf"
+                           mime_type="application/pdf" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1100" 
+                           filename="catalog.pdf" 
+                           mime_type="application/pdf" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1150" 
+                           filename="orphan.png" 
+                           mime_type="image/png" 
+                           data_size="0"/>
+    
+    <ccm_cms.binary_assets_aud object_id="-700" 
+                               rev="0"
+                               filename="header.png" 
+                               mime_type="image/png" 
+                               data_size="0"/>
+    <ccm_cms.binary_assets_aud object_id="-800" 
+                               rev="0"
+                               filename="the-phb.png" 
+                               mime_type="image/png" 
+                               data_size="0"/>
+    <ccm_cms.binary_assets_aud object_id="-900" 
+                               rev="0"
+                               filename="services-header.png" 
+                               mime_type="image/png" 
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-1000" 
+                               rev="0"
+                               filename="product1-datasheet.pdf"
+                               mime_type="application/pdf"
+                               data_size="0"    />
+    <ccm_cms.binary_assets_aud object_id="-1100" 
+                               rev="0"
+                               filename="catalog.pdf" 
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-1150" 
+                               rev="0"
+                               filename="orphan.png" 
+                               mime_type="image/png"
+                               data_size="0" />
+    
+    <ccm_cms.images object_id="-700" 
+                    height="0"
+                    width="0" />
+    <ccm_cms.images object_id="-800"
+                    height="0"
+                    width="0" />
+    <ccm_cms.images object_id="-900"
+                    height="0"
+                    width="0" />
+    <ccm_cms.images object_id="-1150"
+                    height="0"
+                    width="0" />
+    
+    <ccm_cms.images_aud object_id="-700" 
+                        rev="0" 
+                        height="0"
+                        width="0" />
+    <ccm_cms.images_aud object_id="-800" 
+                        rev="0"
+                        height="0"
+                        width="0" />
+    <ccm_cms.images_aud object_id="-900" 
+                        rev="0"
+                        height="0"
+                        width="0" />
+    <ccm_cms.images_aud object_id="-1150" 
+                        rev="0"
+                        height="0"
+                        width="0" />
+    
+    <ccm_cms.files object_id="-1000" />
+    <ccm_cms.files object_id="-1100" />
+    
+    <ccm_cms.files_aud object_id="-1000" 
+                       rev="0" />
+    <ccm_cms.files_aud object_id="-1100" 
+                       rev="0" />
+    
+    <ccm_cms.asset_titles_aud asset_id="-700" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="header.png" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-800" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="the-phb.png" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-900" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="services-header.png" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-1000" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="product1-datasheet.pdf" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-1100" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="catelog.pdf" 
+                              locale="en" />
+
+    
+    <ccm_cms.content_items_aud object_id="-600" 
+                               rev="0"
+                               item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248" 
+                               version="DRAFT" 
+                               content_type_id="-1200" />
+
+    <ccm_cms.content_item_names object_id="-600" 
+                                locale="en" 
+                                localized_value="article1" />
+
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-600"
+                                    localized_value="article1"
+                                    locale="en"
+                                    revtype="0" />
+
+    <ccm_cms.content_item_titles object_id="-600" 
+                                 locale="en" 
+                                 localized_value="Article 1" />
+
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-600"
+                                     localized_value="Article 1"
+                                     locale="en"
+                                     revtype="0" />
+    
+    <ccm_cms.content_type_labels object_id="-1200"
+                                 locale="en" 
+                                 localized_value="Article" />
+
+    <ccm_cms.articles object_id="-600" />
+    
+    <ccm_cms.article_texts 
+        object_id="-600"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-600" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
+        locale="en" 
+        revtype="0" />
+    
+    <ccm_core.categorizations categorization_id="-30100" 
+                              category_id="-200" 
+                              object_id="-600" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30200" 
+                              category_id="-400" 
+                              object_id="-700" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30300" 
+                              category_id="-400" 
+                              object_id="-800" 
+                              category_order="1" 
+                              object_order="3" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30400" 
+                              category_id="-400" 
+                              object_id="-900" 
+                              category_order="1" 
+                              object_order="4" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30600" 
+                              category_id="-400" 
+                              object_id="-1100" 
+                              category_order="1" 
+                              object_order="6" 
+                              category_index="false"
+                              type="folder" />
+    
+    <ccm_cms.attachment_lists list_id="-40100"
+                              name="images"
+                              list_order="1"
+                              uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
+                              item_id="-600" />
+    <ccm_cms.attachment_lists list_id="-40200"
+                              name="downloads"
+                              list_order="1"
+                              uuid="b39e4937-9f15-4b1f-9869-5a1107612e94"
+                              item_id="-600" />
+    
+    <ccm_cms.attachment_lists_aud list_id="-40100"
+                                  rev="0"
+                                  revtype="0"
+                                  name="images"
+                                  list_order="1"
+                                  uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
+                                  item_id="-600" />
+    <ccm_cms.attachment_lists_aud list_id="-40200"
+                                  rev="0"
+                                  revtype="0"
+                                  name="images"
+                                  list_order="1"
+                                  uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
+                                  item_id="-600" />
+    
+    <ccm_cms.attachments attachment_id="-50100"
+                         sort_key="1"
+                         uuid="eb7abe31-9b87-420b-8e5c-ca740b6e54d8"
+                         asset_id="-700"
+                         attachment_list_id="-40100" />
+    <ccm_cms.attachments attachment_id="-50200"
+                         sort_key="2"
+                         uuid="53e090c1-d7b8-4e86-881b-75d7d0bb5218"
+                         asset_id="-900"
+                         attachment_list_id="-40100" />
+    <ccm_cms.attachments attachment_id="-50300"
+                         sort_key="1"
+                         uuid="d1d56133-c139-4ee1-8f37-3a60c34b6dc4"
+                         asset_id="-1000"
+                         attachment_list_id="-40200" />
+    <ccm_cms.attachments attachment_id="-50400"
+                         sort_key="1"
+                         uuid="2ab364cf-28a9-4c3d-803c-a7742e7d49cd"
+                         asset_id="-1100"
+                         attachment_list_id="-40200" />
+    
+    <ccm_cms.attachments_aud attachment_id="-50100"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="eb7abe31-9b87-420b-8e5c-ca740b6e54d8"
+                             asset_id="-700"
+                             attachment_list_id="-40100" />
+    <ccm_cms.attachments_aud attachment_id="-50200"
+                             rev="0"
+                             revtype="0"
+                             sort_key="2"
+                             uuid="53e090c1-d7b8-4e86-881b-75d7d0bb5218"
+                             asset_id="-900"
+                             attachment_list_id="-40100" />
+    <ccm_cms.attachments_aud attachment_id="-50300"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="d1d56133-c139-4ee1-8f37-3a60c34b6dc4"
+                             asset_id="-1000"
+                             attachment_list_id="-40200" />
+    <ccm_cms.attachments_aud attachment_id="-50400"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="2ab364cf-28a9-4c3d-803c-a7742e7d49cd"
+                             asset_id="-1100"
+                             attachment_list_id="-40200" />
+
+        
+</dataset>

ccm-cms/src/test/resources/datasets/org/librecms/assets/AssetManagerTest/after-move-to-other-contentsection.xml

@@ -0,0 +1,562 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+
+    <!-- 
+        * 2 ContentSections with several asset folders
+        * CcmObject with existing AttachmentList
+        * several shared assets
+        
+    -->
+    
+    <ccm_core.ccm_revisions id="0"
+                            timestamp="1451602800" />
+    
+    <ccm_core.ccm_objects object_id="-100" 
+                          display_name="info"
+                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
+    <ccm_core.ccm_objects object_id="-200"
+                          display_name="info_root"
+                          uuid="82014239-9c06-486d-ae8c-4ae47f52a699" />
+    <ccm_core.ccm_objects object_id="-300"
+                          display_name="info_assets"
+                          uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    <ccm_core.ccm_objects object_id="-400"
+                          display_name="media"
+                          uuid="f8546369-4d06-47ea-9138-345d29ab8d68" />
+    <ccm_core.ccm_objects object_id="-500"
+                          display_name="data"
+                          uuid="18fbc7f4-ce7e-45d6-8dad-02887164b99d" />
+    <ccm_core.ccm_objects object_id="-600"
+                          display_name="article1"
+                          uuid="aed4b402-1180-46c6-b42d-7245f4dca248" />
+    <ccm_core.ccm_objects object_id="-700"
+                          display_name="header.png"
+                          uuid="4635589f-b87a-46d9-979e-6af14af063e5" />
+    <ccm_core.ccm_objects object_id="-800"
+                          display_name="the-phb.png"
+                          uuid="0a192e98-3b28-49d0-833f-bc9ff5f9d1d4" />
+    <ccm_core.ccm_objects object_id="-900"
+                          display_name="services-header.png"
+                          uuid="3fe13eb8-ec8d-4523-b42a-7fe1d5cf1a44" />
+    <ccm_core.ccm_objects object_id="-1000"
+                          display_name="product1-datasheet.pdf"
+                          uuid="0393840f-06a6-4ec3-aeb3-a612f845ad60" />
+    <ccm_core.ccm_objects object_id="-1100"
+                          display_name="catalog.pdf"
+                          uuid="cee702ad-79f7-4f78-b93d-46932d958c1c" />
+    <ccm_core.ccm_objects object_id="-1150"
+                          display_name="orphan.png"
+                          uuid="978849a8-6f2d-4746-bec0-05eccf53fc30" />
+    <ccm_core.ccm_objects object_id="-1200"
+                          display_name="org.librecms.contenttypes.Article"
+                          uuid="bd061ab6-9c4f-45ff-ab69-f521008eeac3" />
+    <ccm_core.ccm_objects object_id="-1300" 
+                          display_name="projects"
+                          uuid="2ac48bb5-a5fd-4e30-a80d-d895c2cad78a" />
+    <ccm_core.ccm_objects object_id="-1400"
+                          display_name="projects_root"
+                          uuid="fa88836d-3f3e-4197-949a-e9c697400bf0" />
+    <ccm_core.ccm_objects object_id="-1500"
+                          display_name="projects_assets"
+                          uuid="88c99d18-3a58-477b-89ea-e0ee6d1e4c56" />
+    <ccm_core.ccm_objects object_id="-1600"
+                          display_name="media"
+                          uuid="ec3f0d51-5d9b-440e-bb5a-5fac7da94af1" />
+    <ccm_core.ccm_objects object_id="-1700"
+                          display_name="data"
+                          uuid="80086df3-d682-42bb-9939-8cc04a300575" />
+    
+    <ccm_core.ccm_objects_aud object_id="-600"
+                              rev="0"
+                              revtype="0"
+                              display_name="article1" />
+    <ccm_core.ccm_objects_aud object_id="-700"
+                              rev="0"
+                              revtype="0"
+                              display_name="header.png" />
+    <ccm_core.ccm_objects_aud object_id="-800"
+                              rev="0"
+                              revtype="0"
+                              display_name="the-phb.png" />
+    <ccm_core.ccm_objects_aud object_id="-900"
+                              rev="0"
+                              revtype="0"
+                              display_name="services-header.png" />
+    <ccm_core.ccm_objects_aud object_id="-1000"
+                              rev="0"
+                              revtype="0"
+                              display_name="product1-datasheet.pdf" />
+    <ccm_core.ccm_objects_aud object_id="-1100"
+                              rev="0"
+                              revtype="0"
+                              display_name="catalog.pdf" />
+    <ccm_core.ccm_objects_aud object_id="-1150"
+                              rev="0"
+                              revtype="0"
+                              display_name="orphan.png" />
+
+    <ccm_core.categories object_id="-200" 
+                         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="-300"
+                         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="-400"
+                         unique_id="f8546369-4d06-47ea-9138-345d29ab8d68" 
+                         name="media" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1"/>
+    <ccm_core.categories object_id="-500" 
+                         unique_id="18fbc7f4-ce7e-45d6-8dad-02887164b99d" 
+                         name="data" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1"/>
+    <ccm_core.categories object_id="-1400" 
+                         unique_id="fa88836d-3f3e-4197-949a-e9c697400bf0" 
+                         name="projects_root"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-1500" 
+                         unique_id="88c99d18-3a58-477b-89ea-e0ee6d1e4c56" 
+                         name="projects_assets"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-1600" 
+                         unique_id="ec3f0d51-5d9b-440e-bb5a-5fac7da94af1" 
+                         name="media"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1"    />
+    <ccm_core.categories object_id="-1700" 
+                         unique_id="80086df3-d682-42bb-9939-8cc04a300575"
+                         name="data"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1"    />
+
+    <ccm_core.category_titles object_id="-200"
+                              locale="en"
+                              localized_value="info_root" />
+    <ccm_core.category_titles object_id="-300"
+                              locale="en"
+                              localized_value="info_assets" />
+    <ccm_core.category_titles object_id="-400"
+                              locale="en"
+                              localized_value="media" />
+    <ccm_core.category_titles object_id="-500"
+                              locale="en"
+                              localized_value="data" />
+    <ccm_core.category_titles object_id="-1400"
+                              locale="en"
+                              localized_value="projects_root" />
+    <ccm_core.category_titles object_id="-1500"
+                              locale="en"
+                              localized_value="projects_assets" />
+    <ccm_core.category_titles object_id="-1600"
+                              locale="en"
+                              localized_value="media" />
+    <ccm_core.category_titles object_id="-1700"
+                              locale="en"
+                              localized_value="data" />
+    
+    
+    <ccm_core.resources object_id="-100" 
+                        created="2016-07-15" />
+    <ccm_core.resources object_id="-1300" 
+                        created="2016-07-15" />
+
+    <ccm_core.applications object_id="-100"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="info" />
+    <ccm_core.applications object_id="-1300"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="projects" />
+
+    <ccm_cms.folders object_id="-200"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-300"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-400"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-500"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-1400"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-1500"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-1600"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-1700"
+                     type="ASSETS_FOLDER" />
+    
+    <ccm_cms.content_sections object_id="-100"
+                              label="info"
+                              root_documents_folder_id="-200"
+                              root_assets_folder_id="-300" />
+    <ccm_cms.content_sections object_id="-1300"
+                              label="projects"
+                              root_documents_folder_id="-1400"
+                              root_assets_folder_id="-1500" />
+
+    <ccm_cms.folder_content_section_map folder_id="-200" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-300" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-400" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-500" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-1400" 
+                                        content_section_id="-1300" />
+    <ccm_cms.folder_content_section_map folder_id="-1500" 
+                                        content_section_id="-1300" />
+    <ccm_cms.folder_content_section_map folder_id="-1600" 
+                                        content_section_id="-1300" />
+    <ccm_cms.folder_content_section_map folder_id="-1700" 
+                                        content_section_id="-1300" />
+    
+    <ccm_cms.content_types object_id="-1200" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-100" />
+
+    <ccm_cms.content_items object_id="-600" 
+                           item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248"
+                           version="DRAFT"
+                           content_type_id="-1200" />
+    
+    <ccm_cms.assets object_id="-700" />
+    <ccm_cms.assets object_id="-800" />
+    <ccm_cms.assets object_id="-900" />
+    <ccm_cms.assets object_id="-1000" />
+    <ccm_cms.assets object_id="-1100" />
+    <ccm_cms.assets object_id="-1150" />
+    
+    <ccm_cms.assets_aud object_id="-700" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-800" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-900" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-1000" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-1100" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-1150" 
+                        rev="0" />
+    
+    <ccm_cms.asset_titles asset_id="-700" 
+                          localized_value="header.png" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-800" 
+                          localized_value="the-phb.png" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-900" 
+                          localized_value="services-header.png" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-1000" 
+                          localized_value="product1-datasheet.pdf" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-1100" 
+                          localized_value="catelog.pdf" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-1150" 
+                          localized_value="orphan.pdf" 
+                          locale="en" />
+    
+    <ccm_cms.binary_assets object_id="-700" 
+                           filename="header.png" 
+                           mime_type="image/png" 
+                           data_size="0" />
+    <ccm_cms.binary_assets object_id="-800" 
+                           filename="the-phb.png" 
+                           mime_type="image/png" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-900" 
+                           filename="services-header.png" 
+                           mime_type="image/png" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1000" 
+                           filename="product1-datasheet.pdf"
+                           mime_type="application/pdf" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1100" 
+                           filename="catalog.pdf" 
+                           mime_type="application/pdf" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1150" 
+                           filename="orphan.png" 
+                           mime_type="image/png" 
+                           data_size="0"/>
+    
+    <ccm_cms.binary_assets_aud object_id="-700" 
+                               rev="0"
+                               filename="header.png" 
+                               mime_type="image/png" 
+                               data_size="0"/>
+    <ccm_cms.binary_assets_aud object_id="-800" 
+                               rev="0"
+                               filename="the-phb.png" 
+                               mime_type="image/png" 
+                               data_size="0"/>
+    <ccm_cms.binary_assets_aud object_id="-900" 
+                               rev="0"
+                               filename="services-header.png" 
+                               mime_type="image/png" 
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-1000" 
+                               rev="0"
+                               filename="product1-datasheet.pdf"
+                               mime_type="application/pdf"
+                               data_size="0"    />
+    <ccm_cms.binary_assets_aud object_id="-1100" 
+                               rev="0"
+                               filename="catalog.pdf" 
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-1150" 
+                               rev="0"
+                               filename="orphan.png" 
+                               mime_type="image/png"
+                               data_size="0" />
+    
+    <ccm_cms.images object_id="-700" 
+                    height="0"
+                    width="0" />
+    <ccm_cms.images object_id="-800"
+                    height="0"
+                    width="0" />
+    <ccm_cms.images object_id="-900"
+                    height="0"
+                    width="0" />
+    <ccm_cms.images object_id="-1150"
+                    height="0"
+                    width="0" />
+    
+    <ccm_cms.images_aud object_id="-700" 
+                        rev="0" 
+                        height="0"
+                        width="0" />
+    <ccm_cms.images_aud object_id="-800" 
+                        rev="0"
+                        height="0"
+                        width="0" />
+    <ccm_cms.images_aud object_id="-900" 
+                        rev="0"
+                        height="0"
+                        width="0" />
+    <ccm_cms.images_aud object_id="-1150" 
+                        rev="0"
+                        height="0"
+                        width="0" />
+    
+    <ccm_cms.files object_id="-1000" />
+    <ccm_cms.files object_id="-1100" />
+    
+    <ccm_cms.files_aud object_id="-1000" 
+                       rev="0" />
+    <ccm_cms.files_aud object_id="-1100" 
+                       rev="0" />
+    
+    <ccm_cms.asset_titles_aud asset_id="-700" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="header.png" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-800" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="the-phb.png" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-900" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="services-header.png" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-1000" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="product1-datasheet.pdf" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-1100" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="catelog.pdf" 
+                              locale="en" />
+
+    
+    <ccm_cms.content_items_aud object_id="-600" 
+                               rev="0"
+                               item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248" 
+                               version="DRAFT" 
+                               content_type_id="-1200" />
+
+    <ccm_cms.content_item_names object_id="-600" 
+                                locale="en" 
+                                localized_value="article1" />
+
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-600"
+                                    localized_value="article1"
+                                    locale="en"
+                                    revtype="0" />
+
+    <ccm_cms.content_item_titles object_id="-600" 
+                                 locale="en" 
+                                 localized_value="Article 1" />
+
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-600"
+                                     localized_value="Article 1"
+                                     locale="en"
+                                     revtype="0" />
+    
+    <ccm_cms.content_type_labels object_id="-1200"
+                                 locale="en" 
+                                 localized_value="Article" />
+
+    <ccm_cms.articles object_id="-600" />
+    
+    <ccm_cms.article_texts 
+        object_id="-600"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-600" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
+        locale="en" 
+        revtype="0" />
+    
+    <ccm_core.categorizations categorization_id="-30100" 
+                              category_id="-200" 
+                              object_id="-600" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30200" 
+                              category_id="-400" 
+                              object_id="-700" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30300" 
+                              category_id="-400" 
+                              object_id="-800" 
+                              category_order="1" 
+                              object_order="3" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30400" 
+                              category_id="-400" 
+                              object_id="-900" 
+                              category_order="1" 
+                              object_order="4" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30600" 
+                              category_id="-400" 
+                              object_id="-1100" 
+                              category_order="1" 
+                              object_order="6" 
+                              category_index="false"
+                              type="folder" />
+    
+    <ccm_cms.attachment_lists list_id="-40100"
+                              name="images"
+                              list_order="1"
+                              uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
+                              item_id="-600" />
+    <ccm_cms.attachment_lists list_id="-40200"
+                              name="downloads"
+                              list_order="1"
+                              uuid="b39e4937-9f15-4b1f-9869-5a1107612e94"
+                              item_id="-600" />
+    
+    <ccm_cms.attachment_lists_aud list_id="-40100"
+                                  rev="0"
+                                  revtype="0"
+                                  name="images"
+                                  list_order="1"
+                                  uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
+                                  item_id="-600" />
+    <ccm_cms.attachment_lists_aud list_id="-40200"
+                                  rev="0"
+                                  revtype="0"
+                                  name="images"
+                                  list_order="1"
+                                  uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
+                                  item_id="-600" />
+    
+    <ccm_cms.attachments attachment_id="-50100"
+                         sort_key="1"
+                         uuid="eb7abe31-9b87-420b-8e5c-ca740b6e54d8"
+                         asset_id="-700"
+                         attachment_list_id="-40100" />
+    <ccm_cms.attachments attachment_id="-50200"
+                         sort_key="2"
+                         uuid="53e090c1-d7b8-4e86-881b-75d7d0bb5218"
+                         asset_id="-900"
+                         attachment_list_id="-40100" />
+    <ccm_cms.attachments attachment_id="-50300"
+                         sort_key="1"
+                         uuid="d1d56133-c139-4ee1-8f37-3a60c34b6dc4"
+                         asset_id="-1000"
+                         attachment_list_id="-40200" />
+    <ccm_cms.attachments attachment_id="-50400"
+                         sort_key="1"
+                         uuid="2ab364cf-28a9-4c3d-803c-a7742e7d49cd"
+                         asset_id="-1100"
+                         attachment_list_id="-40200" />
+    
+    <ccm_cms.attachments_aud attachment_id="-50100"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="eb7abe31-9b87-420b-8e5c-ca740b6e54d8"
+                             asset_id="-700"
+                             attachment_list_id="-40100" />
+    <ccm_cms.attachments_aud attachment_id="-50200"
+                             rev="0"
+                             revtype="0"
+                             sort_key="2"
+                             uuid="53e090c1-d7b8-4e86-881b-75d7d0bb5218"
+                             asset_id="-900"
+                             attachment_list_id="-40100" />
+    <ccm_cms.attachments_aud attachment_id="-50300"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="d1d56133-c139-4ee1-8f37-3a60c34b6dc4"
+                             asset_id="-1000"
+                             attachment_list_id="-40200" />
+    <ccm_cms.attachments_aud attachment_id="-50400"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="2ab364cf-28a9-4c3d-803c-a7742e7d49cd"
+                             asset_id="-1100"
+                             attachment_list_id="-40200" />
+
+        
+</dataset>

ccm-cms/src/test/resources/datasets/org/librecms/assets/AssetManagerTest/after-move-to-other-folder.xml

@@ -0,0 +1,562 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dataset>
+
+    <!-- 
+        * 2 ContentSections with several asset folders
+        * CcmObject with existing AttachmentList
+        * several shared assets
+        
+    -->
+    
+    <ccm_core.ccm_revisions id="0"
+                            timestamp="1451602800" />
+    
+    <ccm_core.ccm_objects object_id="-100" 
+                          display_name="info"
+                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
+    <ccm_core.ccm_objects object_id="-200"
+                          display_name="info_root"
+                          uuid="82014239-9c06-486d-ae8c-4ae47f52a699" />
+    <ccm_core.ccm_objects object_id="-300"
+                          display_name="info_assets"
+                          uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
+    <ccm_core.ccm_objects object_id="-400"
+                          display_name="media"
+                          uuid="f8546369-4d06-47ea-9138-345d29ab8d68" />
+    <ccm_core.ccm_objects object_id="-500"
+                          display_name="data"
+                          uuid="18fbc7f4-ce7e-45d6-8dad-02887164b99d" />
+    <ccm_core.ccm_objects object_id="-600"
+                          display_name="article1"
+                          uuid="aed4b402-1180-46c6-b42d-7245f4dca248" />
+    <ccm_core.ccm_objects object_id="-700"
+                          display_name="header.png"
+                          uuid="4635589f-b87a-46d9-979e-6af14af063e5" />
+    <ccm_core.ccm_objects object_id="-800"
+                          display_name="the-phb.png"
+                          uuid="0a192e98-3b28-49d0-833f-bc9ff5f9d1d4" />
+    <ccm_core.ccm_objects object_id="-900"
+                          display_name="services-header.png"
+                          uuid="3fe13eb8-ec8d-4523-b42a-7fe1d5cf1a44" />
+    <ccm_core.ccm_objects object_id="-1000"
+                          display_name="product1-datasheet.pdf"
+                          uuid="0393840f-06a6-4ec3-aeb3-a612f845ad60" />
+    <ccm_core.ccm_objects object_id="-1100"
+                          display_name="catalog.pdf"
+                          uuid="cee702ad-79f7-4f78-b93d-46932d958c1c" />
+    <ccm_core.ccm_objects object_id="-1150"
+                          display_name="orphan.png"
+                          uuid="978849a8-6f2d-4746-bec0-05eccf53fc30" />
+    <ccm_core.ccm_objects object_id="-1200"
+                          display_name="org.librecms.contenttypes.Article"
+                          uuid="bd061ab6-9c4f-45ff-ab69-f521008eeac3" />
+    <ccm_core.ccm_objects object_id="-1300" 
+                          display_name="projects"
+                          uuid="2ac48bb5-a5fd-4e30-a80d-d895c2cad78a" />
+    <ccm_core.ccm_objects object_id="-1400"
+                          display_name="projects_root"
+                          uuid="fa88836d-3f3e-4197-949a-e9c697400bf0" />
+    <ccm_core.ccm_objects object_id="-1500"
+                          display_name="projects_assets"
+                          uuid="88c99d18-3a58-477b-89ea-e0ee6d1e4c56" />
+    <ccm_core.ccm_objects object_id="-1600"
+                          display_name="media"
+                          uuid="ec3f0d51-5d9b-440e-bb5a-5fac7da94af1" />
+    <ccm_core.ccm_objects object_id="-1700"
+                          display_name="data"
+                          uuid="80086df3-d682-42bb-9939-8cc04a300575" />
+    
+    <ccm_core.ccm_objects_aud object_id="-600"
+                              rev="0"
+                              revtype="0"
+                              display_name="article1" />
+    <ccm_core.ccm_objects_aud object_id="-700"
+                              rev="0"
+                              revtype="0"
+                              display_name="header.png" />
+    <ccm_core.ccm_objects_aud object_id="-800"
+                              rev="0"
+                              revtype="0"
+                              display_name="the-phb.png" />
+    <ccm_core.ccm_objects_aud object_id="-900"
+                              rev="0"
+                              revtype="0"
+                              display_name="services-header.png" />
+    <ccm_core.ccm_objects_aud object_id="-1000"
+                              rev="0"
+                              revtype="0"
+                              display_name="product1-datasheet.pdf" />
+    <ccm_core.ccm_objects_aud object_id="-1100"
+                              rev="0"
+                              revtype="0"
+                              display_name="catalog.pdf" />
+    <ccm_core.ccm_objects_aud object_id="-1150"
+                              rev="0"
+                              revtype="0"
+                              display_name="orphan.png" />
+
+    <ccm_core.categories object_id="-200" 
+                         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="-300"
+                         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="-400"
+                         unique_id="f8546369-4d06-47ea-9138-345d29ab8d68" 
+                         name="media" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1"/>
+    <ccm_core.categories object_id="-500" 
+                         unique_id="18fbc7f4-ce7e-45d6-8dad-02887164b99d" 
+                         name="data" 
+                         enabled="true" 
+                         visible="true" 
+                         abstract_category="false" 
+                         category_order="1"/>
+    <ccm_core.categories object_id="-1400" 
+                         unique_id="fa88836d-3f3e-4197-949a-e9c697400bf0" 
+                         name="projects_root"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-1500" 
+                         unique_id="88c99d18-3a58-477b-89ea-e0ee6d1e4c56" 
+                         name="projects_assets"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1" />
+    <ccm_core.categories object_id="-1600" 
+                         unique_id="ec3f0d51-5d9b-440e-bb5a-5fac7da94af1" 
+                         name="media"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1"    />
+    <ccm_core.categories object_id="-1700" 
+                         unique_id="80086df3-d682-42bb-9939-8cc04a300575"
+                         name="data"
+                         enabled="true"
+                         visible="true"
+                         abstract_category="false"
+                         category_order="1"    />
+
+    <ccm_core.category_titles object_id="-200"
+                              locale="en"
+                              localized_value="info_root" />
+    <ccm_core.category_titles object_id="-300"
+                              locale="en"
+                              localized_value="info_assets" />
+    <ccm_core.category_titles object_id="-400"
+                              locale="en"
+                              localized_value="media" />
+    <ccm_core.category_titles object_id="-500"
+                              locale="en"
+                              localized_value="data" />
+    <ccm_core.category_titles object_id="-1400"
+                              locale="en"
+                              localized_value="projects_root" />
+    <ccm_core.category_titles object_id="-1500"
+                              locale="en"
+                              localized_value="projects_assets" />
+    <ccm_core.category_titles object_id="-1600"
+                              locale="en"
+                              localized_value="media" />
+    <ccm_core.category_titles object_id="-1700"
+                              locale="en"
+                              localized_value="data" />
+    
+    
+    <ccm_core.resources object_id="-100" 
+                        created="2016-07-15" />
+    <ccm_core.resources object_id="-1300" 
+                        created="2016-07-15" />
+
+    <ccm_core.applications object_id="-100"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="info" />
+    <ccm_core.applications object_id="-1300"
+                           application_type="org.librecms.contentsection.ContentSection"
+                           primary_url="projects" />
+
+    <ccm_cms.folders object_id="-200"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-300"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-400"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-500"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-1400"
+                     type="DOCUMENTS_FOLDER" />
+    <ccm_cms.folders object_id="-1500"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-1600"
+                     type="ASSETS_FOLDER" />
+    <ccm_cms.folders object_id="-1700"
+                     type="ASSETS_FOLDER" />
+    
+    <ccm_cms.content_sections object_id="-100"
+                              label="info"
+                              root_documents_folder_id="-200"
+                              root_assets_folder_id="-300" />
+    <ccm_cms.content_sections object_id="-1300"
+                              label="projects"
+                              root_documents_folder_id="-1400"
+                              root_assets_folder_id="-1500" />
+
+    <ccm_cms.folder_content_section_map folder_id="-200" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-300" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-400" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-500" 
+                                        content_section_id="-100" />
+    <ccm_cms.folder_content_section_map folder_id="-1400" 
+                                        content_section_id="-1300" />
+    <ccm_cms.folder_content_section_map folder_id="-1500" 
+                                        content_section_id="-1300" />
+    <ccm_cms.folder_content_section_map folder_id="-1600" 
+                                        content_section_id="-1300" />
+    <ccm_cms.folder_content_section_map folder_id="-1700" 
+                                        content_section_id="-1300" />
+    
+    <ccm_cms.content_types object_id="-1200" 
+                           content_item_class="org.librecms.contenttypes.Article" 
+                           content_section_id="-100" />
+
+    <ccm_cms.content_items object_id="-600" 
+                           item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248"
+                           version="DRAFT"
+                           content_type_id="-1200" />
+    
+    <ccm_cms.assets object_id="-700" />
+    <ccm_cms.assets object_id="-800" />
+    <ccm_cms.assets object_id="-900" />
+    <ccm_cms.assets object_id="-1000" />
+    <ccm_cms.assets object_id="-1100" />
+    <ccm_cms.assets object_id="-1150" />
+    
+    <ccm_cms.assets_aud object_id="-700" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-800" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-900" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-1000" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-1100" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-1150" 
+                        rev="0" />
+    
+    <ccm_cms.asset_titles asset_id="-700" 
+                          localized_value="header.png" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-800" 
+                          localized_value="the-phb.png" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-900" 
+                          localized_value="services-header.png" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-1000" 
+                          localized_value="product1-datasheet.pdf" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-1100" 
+                          localized_value="catelog.pdf" 
+                          locale="en" />
+    <ccm_cms.asset_titles asset_id="-1150" 
+                          localized_value="orphan.pdf" 
+                          locale="en" />
+    
+    <ccm_cms.binary_assets object_id="-700" 
+                           filename="header.png" 
+                           mime_type="image/png" 
+                           data_size="0" />
+    <ccm_cms.binary_assets object_id="-800" 
+                           filename="the-phb.png" 
+                           mime_type="image/png" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-900" 
+                           filename="services-header.png" 
+                           mime_type="image/png" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1000" 
+                           filename="product1-datasheet.pdf"
+                           mime_type="application/pdf" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1100" 
+                           filename="catalog.pdf" 
+                           mime_type="application/pdf" 
+                           data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1150" 
+                           filename="orphan.png" 
+                           mime_type="image/png" 
+                           data_size="0"/>
+    
+    <ccm_cms.binary_assets_aud object_id="-700" 
+                               rev="0"
+                               filename="header.png" 
+                               mime_type="image/png" 
+                               data_size="0"/>
+    <ccm_cms.binary_assets_aud object_id="-800" 
+                               rev="0"
+                               filename="the-phb.png" 
+                               mime_type="image/png" 
+                               data_size="0"/>
+    <ccm_cms.binary_assets_aud object_id="-900" 
+                               rev="0"
+                               filename="services-header.png" 
+                               mime_type="image/png" 
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-1000" 
+                               rev="0"
+                               filename="product1-datasheet.pdf"
+                               mime_type="application/pdf"
+                               data_size="0"    />
+    <ccm_cms.binary_assets_aud object_id="-1100" 
+                               rev="0"
+                               filename="catalog.pdf" 
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-1150" 
+                               rev="0"
+                               filename="orphan.png" 
+                               mime_type="image/png"
+                               data_size="0" />
+    
+    <ccm_cms.images object_id="-700" 
+                    height="0"
+                    width="0" />
+    <ccm_cms.images object_id="-800"
+                    height="0"
+                    width="0" />
+    <ccm_cms.images object_id="-900"
+                    height="0"
+                    width="0" />
+    <ccm_cms.images object_id="-1150"
+                    height="0"
+                    width="0" />
+    
+    <ccm_cms.images_aud object_id="-700" 
+                        rev="0" 
+                        height="0"
+                        width="0" />
+    <ccm_cms.images_aud object_id="-800" 
+                        rev="0"
+                        height="0"
+                        width="0" />
+    <ccm_cms.images_aud object_id="-900" 
+                        rev="0"
+                        height="0"
+                        width="0" />
+    <ccm_cms.images_aud object_id="-1150" 
+                        rev="0"
+                        height="0"
+                        width="0" />
+    
+    <ccm_cms.files object_id="-1000" />
+    <ccm_cms.files object_id="-1100" />
+    
+    <ccm_cms.files_aud object_id="-1000" 
+                       rev="0" />
+    <ccm_cms.files_aud object_id="-1100" 
+                       rev="0" />
+    
+    <ccm_cms.asset_titles_aud asset_id="-700" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="header.png" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-800" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="the-phb.png" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-900" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="services-header.png" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-1000" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="product1-datasheet.pdf" 
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-1100" 
+                              rev="0"
+                              revtype="0"
+                              localized_value="catelog.pdf" 
+                              locale="en" />
+
+    
+    <ccm_cms.content_items_aud object_id="-600" 
+                               rev="0"
+                               item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248" 
+                               version="DRAFT" 
+                               content_type_id="-1200" />
+
+    <ccm_cms.content_item_names object_id="-600" 
+                                locale="en" 
+                                localized_value="article1" />
+
+    <ccm_cms.content_item_names_aud rev="0" 
+                                    object_id="-600"
+                                    localized_value="article1"
+                                    locale="en"
+                                    revtype="0" />
+
+    <ccm_cms.content_item_titles object_id="-600" 
+                                 locale="en" 
+                                 localized_value="Article 1" />
+
+    <ccm_cms.content_item_titles_aud rev="0" 
+                                     object_id="-600"
+                                     localized_value="Article 1"
+                                     locale="en"
+                                     revtype="0" />
+    
+    <ccm_cms.content_type_labels object_id="-1200"
+                                 locale="en" 
+                                 localized_value="Article" />
+
+    <ccm_cms.articles object_id="-600" />
+    
+    <ccm_cms.article_texts 
+        object_id="-600"
+        locale="en" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
+
+    <ccm_cms.article_texts_aud 
+        rev="0" 
+        object_id="-600" 
+        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
+        locale="en" 
+        revtype="0" />
+    
+    <ccm_core.categorizations categorization_id="-30100" 
+                              category_id="-200" 
+                              object_id="-600" 
+                              category_order="1" 
+                              object_order="1" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30200" 
+                              category_id="-400" 
+                              object_id="-700" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30300" 
+                              category_id="-400" 
+                              object_id="-800" 
+                              category_order="1" 
+                              object_order="3" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30400" 
+                              category_id="-400" 
+                              object_id="-900" 
+                              category_order="1" 
+                              object_order="4" 
+                              category_index="false"
+                              type="folder" />
+    <ccm_core.categorizations categorization_id="-30600" 
+                              category_id="-400" 
+                              object_id="-1100" 
+                              category_order="1" 
+                              object_order="6" 
+                              category_index="false"
+                              type="folder" />
+    
+    <ccm_cms.attachment_lists list_id="-40100"
+                              name="images"
+                              list_order="1"
+                              uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
+                              item_id="-600" />
+    <ccm_cms.attachment_lists list_id="-40200"
+                              name="downloads"
+                              list_order="1"
+                              uuid="b39e4937-9f15-4b1f-9869-5a1107612e94"
+                              item_id="-600" />
+    
+    <ccm_cms.attachment_lists_aud list_id="-40100"
+                                  rev="0"
+                                  revtype="0"
+                                  name="images"
+                                  list_order="1"
+                                  uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
+                                  item_id="-600" />
+    <ccm_cms.attachment_lists_aud list_id="-40200"
+                                  rev="0"
+                                  revtype="0"
+                                  name="images"
+                                  list_order="1"
+                                  uuid="45fd7d2f-7f60-480c-8e06-8763c4558213"
+                                  item_id="-600" />
+    
+    <ccm_cms.attachments attachment_id="-50100"
+                         sort_key="1"
+                         uuid="eb7abe31-9b87-420b-8e5c-ca740b6e54d8"
+                         asset_id="-700"
+                         attachment_list_id="-40100" />
+    <ccm_cms.attachments attachment_id="-50200"
+                         sort_key="2"
+                         uuid="53e090c1-d7b8-4e86-881b-75d7d0bb5218"
+                         asset_id="-900"
+                         attachment_list_id="-40100" />
+    <ccm_cms.attachments attachment_id="-50300"
+                         sort_key="1"
+                         uuid="d1d56133-c139-4ee1-8f37-3a60c34b6dc4"
+                         asset_id="-1000"
+                         attachment_list_id="-40200" />
+    <ccm_cms.attachments attachment_id="-50400"
+                         sort_key="1"
+                         uuid="2ab364cf-28a9-4c3d-803c-a7742e7d49cd"
+                         asset_id="-1100"
+                         attachment_list_id="-40200" />
+    
+    <ccm_cms.attachments_aud attachment_id="-50100"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="eb7abe31-9b87-420b-8e5c-ca740b6e54d8"
+                             asset_id="-700"
+                             attachment_list_id="-40100" />
+    <ccm_cms.attachments_aud attachment_id="-50200"
+                             rev="0"
+                             revtype="0"
+                             sort_key="2"
+                             uuid="53e090c1-d7b8-4e86-881b-75d7d0bb5218"
+                             asset_id="-900"
+                             attachment_list_id="-40100" />
+    <ccm_cms.attachments_aud attachment_id="-50300"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="d1d56133-c139-4ee1-8f37-3a60c34b6dc4"
+                             asset_id="-1000"
+                             attachment_list_id="-40200" />
+    <ccm_cms.attachments_aud attachment_id="-50400"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="2ab364cf-28a9-4c3d-803c-a7742e7d49cd"
+                             asset_id="-1100"
+                             attachment_list_id="-40200" />
+
+        
+</dataset>

ccm-cms/src/test/resources/datasets/org/librecms/assets/AssetManagerTest/data.xml

@@ -44,6 +44,9 @@
     <ccm_core.ccm_objects object_id="-1100"
                           display_name="catalog.pdf"
                           uuid="cee702ad-79f7-4f78-b93d-46932d958c1c" />
+    <ccm_core.ccm_objects object_id="-1150"
+                          display_name="orphan.png"
+                          uuid="978849a8-6f2d-4746-bec0-05eccf53fc30" />
     <ccm_core.ccm_objects object_id="-1200"
                           display_name="org.librecms.contenttypes.Article"
                           uuid="bd061ab6-9c4f-45ff-ab69-f521008eeac3" />
@@ -87,6 +90,10 @@
                               rev="0"
                               revtype="0"
                               display_name="catalog.pdf" />
+    <ccm_core.ccm_objects_aud object_id="-1150"
+                              rev="0"
+                              revtype="0"
+                              display_name="orphan.png" />
 
     <ccm_core.categories object_id="-200" 
                          unique_id="82014239-9c06-486d-ae8c-4ae47f52a699" 
@@ -218,7 +225,7 @@
     <ccm_cms.folder_content_section_map folder_id="-500" 
                                         content_section_id="-100" />
     <ccm_cms.folder_content_section_map folder_id="-1400" 
-                                            content_section_id="-1300" />
+                                        content_section_id="-1300" />
     <ccm_cms.folder_content_section_map folder_id="-1500" 
                                         content_section_id="-1300" />
     <ccm_cms.folder_content_section_map folder_id="-1600" 
@@ -240,6 +247,7 @@
     <ccm_cms.assets object_id="-900" />
     <ccm_cms.assets object_id="-1000" />
     <ccm_cms.assets object_id="-1100" />
+    <ccm_cms.assets object_id="-1150" />
     
     <ccm_cms.assets_aud object_id="-700" 
                         rev="0" />
@@ -251,6 +259,8 @@
                         rev="0" />
     <ccm_cms.assets_aud object_id="-1100" 
                         rev="0" />
+    <ccm_cms.assets_aud object_id="-1150" 
+                        rev="0" />
     
     <ccm_cms.asset_titles asset_id="-700" 
                           localized_value="header.png" 
@@ -267,6 +277,9 @@
     <ccm_cms.asset_titles asset_id="-1100" 
                           localized_value="catelog.pdf" 
                           locale="en" />
+    <ccm_cms.asset_titles asset_id="-1150" 
+                          localized_value="orphan.pdf" 
+                          locale="en" />
     
     <ccm_cms.binary_assets object_id="-700" 
                            filename="header.png" 
@@ -274,11 +287,11 @@
                            data_size="0" />
     <ccm_cms.binary_assets object_id="-800" 
                            filename="the-phb.png" 
-                           mime_type="images/png" 
+                           mime_type="image/png" 
                            data_size="0"/>
     <ccm_cms.binary_assets object_id="-900" 
                            filename="services-header.png" 
-                           mime_type="images/png" 
+                           mime_type="image/png" 
                            data_size="0"/>
     <ccm_cms.binary_assets object_id="-1000" 
                            filename="product1-datasheet.pdf"
@@ -288,6 +301,10 @@
                            filename="catalog.pdf" 
                            mime_type="application/pdf" 
                            data_size="0"/>
+    <ccm_cms.binary_assets object_id="-1150" 
+                           filename="orphan.png" 
+                           mime_type="image/png" 
+                           data_size="0"/>
     
     <ccm_cms.binary_assets_aud object_id="-700" 
                                rev="0"
@@ -297,12 +314,13 @@
     <ccm_cms.binary_assets_aud object_id="-800" 
                                rev="0"
                                filename="the-phb.png" 
-                               mime_type="images/png" 
+                               mime_type="image/png" 
                                data_size="0"/>
     <ccm_cms.binary_assets_aud object_id="-900" 
                                rev="0"
                                filename="services-header.png" 
-                               mime_type="images/png" data_size="0" />
+                               mime_type="image/png" 
+                               data_size="0" />
     <ccm_cms.binary_assets_aud object_id="-1000" 
                                rev="0"
                                filename="product1-datasheet.pdf"
@@ -312,7 +330,12 @@
                                rev="0"
                                filename="catalog.pdf" 
                                mime_type="application/pdf"
-                               data_size="0"    />
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-1150" 
+                               rev="0"
+                               filename="orphan.png" 
+                               mime_type="image/png"
+                               data_size="0" />
     
     <ccm_cms.images object_id="-700" 
                     height="0"
@@ -323,6 +346,9 @@
     <ccm_cms.images object_id="-900"
                     height="0"
                     width="0" />
+    <ccm_cms.images object_id="-1150"
+                    height="0"
+                    width="0" />
     
     <ccm_cms.images_aud object_id="-700" 
                         rev="0" 
@@ -336,6 +362,10 @@
                         rev="0"
                         height="0"
                         width="0" />
+    <ccm_cms.images_aud object_id="-1150" 
+                        rev="0"
+                        height="0"
+                        width="0" />
     
     <ccm_cms.files object_id="-1000" />
     <ccm_cms.files object_id="-1100" />
@@ -444,13 +474,6 @@
                               object_order="4" 
                               category_index="false"
                               type="folder" />
-    <ccm_core.categorizations categorization_id="-30500" 
-                              category_id="-400" 
-                              object_id="-1000" 
-                              category_order="1" 
-                              object_order="5" 
-                              category_index="false"
-                              type="folder" />
     <ccm_core.categorizations categorization_id="-30600" 
                               category_id="-400" 
                               object_id="-1100"