CCM NG/ccm-cms: ContentItemManager now processes attachments of items.

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

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

@@ -139,6 +139,12 @@ public class AttachmentList implements Comparable<AttachmentList>,
     @OneToMany(mappedBy = "attachmentList")
     private List<ItemAttachment<?>> attachments;
 
+    public AttachmentList() {
+        title = new LocalizedString();
+        description = new LocalizedString();
+        attachments = new ArrayList<>();
+    }
+    
     public long getListId() {
         return listId;
     }

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

@@ -19,6 +19,7 @@
 package org.librecms.contentsection;
 
 import com.arsdigita.kernel.KernelConfig;
+import com.arsdigita.util.UncheckedWrapperException;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -59,8 +60,11 @@ import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
+import java.util.logging.Level;
 
 import javax.persistence.EntityManager;
 import javax.persistence.TypedQuery;
@@ -107,6 +111,9 @@ public class ContentItemManager {
     @Inject
     private FolderRepository folderRepo;
 
+    @Inject
+    private AssetManager assetManager;
+
     /**
      * Creates a new content item in the provided content section and folder
      * with the workflow.
@@ -339,8 +346,7 @@ public class ContentItemManager {
 
         final Optional<ContentType> contentType = typeRepo
             .findByContentSectionAndClass(
-                item.getContentType().getContentSection(), item.
+                targetFolder.getSection(), item.getClass());
-                getClass());
 
         if (!contentType.isPresent()) {
             throw new IllegalArgumentException(String.format(
@@ -404,11 +410,10 @@ public class ContentItemManager {
             targetFolder,
             CATEGORIZATION_TYPE_FOLDER);
 
-        // !!!!!!!!!!!!!!!!!!!!!
+        for (AttachmentList attachmentList : item.getAttachments()) {
-        // ToDo copy Attachments
+            copyAttachmentList(attachmentList, copy);
-        // !!!!!!!!!!!!!!!!!!!!!
+        }
-        //
+
-        //
         final BeanInfo beanInfo;
         try {
             beanInfo = Introspector.getBeanInfo(item.getClass());
@@ -541,9 +546,13 @@ public class ContentItemManager {
 
     private boolean propertyIsExcluded(final String name) {
         final String[] excluded = new String[]{
-            "objectId", "uuid", "lifecycle", "workflow", "categories",
+            "attachments",
-            "attachments"
+            "categories",
-        };
+            "contentType",
+            "lifecycle",
+            "objectId",
+            "uuid",
+            "workflow",};
 
         boolean result = false;
         for (final String current : excluded) {
@@ -555,6 +564,125 @@ public class ContentItemManager {
         return result;
     }
 
+    private void copyAttachmentList(final AttachmentList list,
+                                    final ContentItem target) {
+        final AttachmentList targetList = new AttachmentList();
+        for (final Locale locale : list.getDescription().getAvailableLocales()) {
+            targetList.getDescription().addValue(
+                locale, list.getDescription().getValue(locale));
+        }
+        targetList.setItem(target);
+        targetList.setName(list.getName());
+        targetList.setOrder(list.getOrder());
+        for (Map.Entry<Locale, String> title : list.getTitle().getValues()
+            .entrySet()) {
+            targetList.getTitle().addValue(title.getKey(), title.getValue());
+        }
+        targetList.setUuid(UUID.randomUUID().toString());
+
+        entityManager.persist(list);
+
+        for (ItemAttachment<?> attachment : list.getAttachments()) {
+            if (assetManager.isShared(attachment.getAsset())) {
+                copySharedAssetAttachment(attachment, targetList);
+            } else {
+                copyAssetAttachment(attachment, targetList);
+            }
+        }
+
+        entityManager.merge(list);
+    }
+
+    private void copySharedAssetAttachment(final ItemAttachment<?> attachment,
+                                           final AttachmentList target) {
+        final ItemAttachment<Asset> itemAttachment = new ItemAttachment<>();
+        itemAttachment.setAsset(attachment.getAsset());
+        itemAttachment.setAttachmentList(target);
+        itemAttachment.setSortKey(attachment.getSortKey());
+        itemAttachment.setUuid(UUID.randomUUID().toString());
+
+        entityManager.persist(itemAttachment);
+        target.addAttachment(itemAttachment);
+        entityManager.merge(target);
+    }
+
+    private void copyAssetAttachment(final ItemAttachment<?> attachment,
+                                     final AttachmentList targetList) {
+        final Asset source = attachment.getAsset();
+        final Asset target;
+        try {
+            target = source.getClass().newInstance();
+        } catch (InstantiationException | IllegalAccessException ex) {
+            throw new UncheckedWrapperException(ex);
+        }
+
+        final BeanInfo beanInfo;
+        try {
+            beanInfo = Introspector.getBeanInfo(source.getClass());
+        } catch (IntrospectionException ex) {
+            throw new UncheckedWrapperException(ex);
+        }
+
+        for (final PropertyDescriptor propertyDescriptor : beanInfo
+            .getPropertyDescriptors()) {
+            final String propertyName = propertyDescriptor.getName();
+            if ("objectId".equals(propertyName)
+                    || "uuid".equals(propertyName)
+                    || "itemAttachments".equals(propertyName)
+                    || "categories".equals(propertyName)) {
+                continue;
+            }
+
+            final Class<?> propType = propertyDescriptor.getPropertyType();
+            final Method readMethod = propertyDescriptor.getReadMethod();
+            final Method writeMethod = propertyDescriptor.getWriteMethod();
+
+            if (writeMethod == null) {
+                continue;
+            }
+
+            if (LocalizedString.class.equals(propType)) {
+                final LocalizedString sourceStr;
+                final LocalizedString targetStr;
+                try {
+                    sourceStr = (LocalizedString) readMethod.invoke(source);
+                    targetStr = (LocalizedString) readMethod.invoke(target);
+                } catch (IllegalAccessException
+                         | IllegalArgumentException
+                         | InvocationTargetException ex) {
+                    throw new UncheckedWrapperException(ex);
+                }
+
+                sourceStr.getAvailableLocales().forEach(
+                    locale -> targetStr.addValue(locale,
+                                                 sourceStr.getValue(locale)));
+            } else {
+                final Object value;
+                try {
+                    value = readMethod.invoke(source);
+                    writeMethod.invoke(target, value);
+                } catch (IllegalAccessException
+                         | IllegalArgumentException
+                         | InvocationTargetException ex) {
+                    throw new UncheckedWrapperException(ex);
+                }
+            }
+        }
+
+        target.setUuid(UUID.randomUUID().toString());
+
+        entityManager.persist(target);
+        final ItemAttachment<Asset> targetAttachment = new ItemAttachment<>();
+        targetAttachment.setAsset(target);
+        targetAttachment.setSortKey(attachment.getSortKey());
+        targetAttachment.setUuid(UUID.randomUUID().toString());
+        entityManager.persist(targetAttachment);
+
+        targetAttachment.setAttachmentList(targetList);
+        targetList.addAttachment(targetAttachment);
+        entityManager.merge(targetAttachment);
+    }
+
     /**
      * Creates a live version of content item or updates the live version of a
      * content item if there already a live version using the default lifecycle
@@ -613,14 +741,17 @@ public class ContentItemManager {
         final ContentItem liveItem;
 
         if (isLive(item)) {
-            liveItem = getLiveVersion(item, ContentItem.class).get();
+            final ContentItem oldLiveItem = getLiveVersion(
-        } else {
+                item, ContentItem.class).get();
-            try {
+            unpublish(oldLiveItem);
-                liveItem = draftItem.getClass().newInstance();
-            } catch (InstantiationException | IllegalAccessException ex) {
-                throw new RuntimeException(ex);
-            }
         }
+//        else {
+        try {
+            liveItem = draftItem.getClass().newInstance();
+        } catch (InstantiationException | IllegalAccessException ex) {
+            throw new RuntimeException(ex);
+        }
+//        }
 
         liveItem.setVersion(ContentItemVersion.PUBLISHING);
         liveItem.setItemUuid(draftItem.getItemUuid());
@@ -650,11 +781,10 @@ public class ContentItemManager {
                                  categorization.getCategory(),
                                  categorization.getType()));
 
-        // !!!!!!!!!!!!!!!!!!!!!
+        for (AttachmentList attachmentList : item.getAttachments()) {
-        // ToDo copy Attachments
+            copyAttachmentList(attachmentList, liveItem);
-        // !!!!!!!!!!!!!!!!!!!!!
+        }
-        //
+
-        //
         final BeanInfo beanInfo;
         try {
             beanInfo = Introspector.getBeanInfo(item.getClass());
@@ -833,6 +963,15 @@ public class ContentItemManager {
             return;
         }
 
+        final List<AttachmentList> attachmentLists = liveItem.get()
+            .getAttachments();
+        for (final AttachmentList attachmentList : attachmentLists) {
+            attachmentList.getAttachments().forEach(
+                attachment -> {
+                    unpublishAttachment(attachment);
+                });
+        }
+
         final List<Category> categories = liveItem
             .get()
             .getCategories()
@@ -855,6 +994,21 @@ public class ContentItemManager {
 
     }
 
+    private void unpublishAttachment(final ItemAttachment<?> itemAttachment) {
+        final Asset asset = itemAttachment.getAsset();
+
+        asset.removeItemAttachment(itemAttachment);
+        itemAttachment.setAsset(null);
+
+        if (assetManager.isShared(asset)) {
+            entityManager.merge(asset);
+        } else {
+            entityManager.remove(asset);
+        }
+
+        entityManager.remove(itemAttachment);
+    }
+
     /**
      * Unpublishes all live items in a folder. Items in sub folders will
      * <strong>not</strong> be unpublished!.

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

@@ -24,6 +24,7 @@ import org.libreccm.core.Identifiable;
 import java.io.Serializable;
 import java.util.Objects;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -85,7 +86,7 @@ public class ItemAttachment<T extends Asset>
     /**
      * The {@link AttachmentList} to which this attachment belongs.
      */
-    @ManyToOne
+    @ManyToOne(cascade = {CascadeType.PERSIST})
     @JoinColumn(name = "ATTACHMENT_LIST_ID")
     private AttachmentList attachmentList;
 
@@ -93,7 +94,8 @@ public class ItemAttachment<T extends Asset>
      * The {@link Asset} which is linked by this attachment to the
      * {@link #attachmentList}.
      */
-    @ManyToOne(targetEntity = Asset.class)
+    @ManyToOne(targetEntity = Asset.class, 
+               cascade = {CascadeType.PERSIST})
     @JoinColumn(name = "ASSET_ID")
     private T asset;
 

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

@@ -154,6 +154,7 @@ public class ContentItemManagerTest {
             .addPackage(org.librecms.contentsection.Asset.class.getPackage())
             .addPackage(org.librecms.contentsection.AttachmentList.class
                 .getPackage())
+            .addPackage(org.librecms.assets.BinaryAsset.class.getPackage())
             .addPackage(org.librecms.lifecycle.Lifecycle.class.getPackage())
             .addPackage(org.librecms.contentsection.ContentSection.class
                 .getPackage())
@@ -534,7 +535,7 @@ public class ContentItemManagerTest {
                           "uuid",
                           "workflow_id"
         })
-    public void moveToOtherContentSection() {
+    public void moveItemToOtherContentSection() {
         final Optional<ContentItem> item = itemRepo.findById(-10100L);
         final Folder targetFolder = folderRepo.findById(-2300L);
 
@@ -544,9 +545,8 @@ public class ContentItemManagerTest {
         itemManager.move(item.get(), targetFolder);
     }
 
-        /**
+    /**
-     * Verifies that
+     * Verifies that      {@link ContentItemManager#move(org.librecms.contentsection.ContentItem, org.librecms.contentsection.Folder) 
-     * {@link ContentItemManager#move(org.librecms.contentsection.ContentItem, org.librecms.contentsection.Folder) 
      * throws an {@link IllegalArgumentException} if the type of the item to
      * copy has not been registered in content section to which the target
      * folder belongs.
@@ -554,9 +554,9 @@ public class ContentItemManagerTest {
     @Test(expected = IllegalArgumentException.class)
     @InSequence(4120)
     @UsingDataSet("datasets/org/librecms/contentsection/"
-        + "ContentItemManagerTest/data.xml")
+                      + "ContentItemManagerTest/data.xml")
     @ShouldMatchDataSet("datasets/org/librecms/contentsection/"
-        + "ContentItemManagerTest/data.xml")
+                            + "ContentItemManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void moveToOtherContentSectionTypeNotPresent() {
         final Optional<ContentItem> item = itemRepo.findById(-10400L);
@@ -568,7 +568,6 @@ public class ContentItemManagerTest {
         itemManager.move(item.get(), targetFolder);
     }
 
-    
     /**
      * Verifies that
      * {@link ContentItemManager#move(org.librecms.contentsection.ContentItem, org.librecms.contentsection.Folder)}
@@ -620,14 +619,18 @@ public class ContentItemManagerTest {
     @ShouldMatchDataSet(
         value = "datasets/org/librecms/contentsection/"
                     + "ContentItemManagerTest/after-copy-to-other-folder.xml",
-        excludeColumns = {"categorization_id",
+        excludeColumns = {"asset_id",
+                          "attachment_id",
+                          "attachment_list_id",
+                          "categorization_id",
                           "id",
+                          "item_id",
                           "item_uuid",
                           "lifecycle_id",
+                          "list_id",
                           "object_id",
                           "object_order",
                           "phase_id",
-                          "rev",
                           "task_id",
                           "uuid",
                           "timestamp",
@@ -654,19 +657,23 @@ public class ContentItemManagerTest {
     @ShouldMatchDataSet(
         value = "datasets/org/librecms/contentsection/"
                     + "ContentItemManagerTest/after-copy-to-folder-in-other-section.xml",
-        excludeColumns = {"categorization_id",
+        excludeColumns = {"asset_id",
-                          "content_type_id",
+                          "attachment_id",
+                          "attachment_list_id",
+                          "categorization_id",
                           "id",
+                          "item_id",
                           "item_uuid",
                           "lifecycle_id",
+                          "list_id",
                           "object_id",
                           "object_order",
                           "phase_id",
-                          "rev",
                           "task_id",
                           "uuid",
                           "timestamp",
-                          "workflow_id"})
+                          "workflow_id"
+        })
     public void copyToFolderInOtherSection() {
         final Optional<ContentItem> source = itemRepo.findById(-10100L);
         final Folder targetFolder = folderRepo.findById(-2300L);
@@ -690,9 +697,9 @@ public class ContentItemManagerTest {
     @Test(expected = IllegalArgumentException.class)
     @InSequence(4120)
     @UsingDataSet("datasets/org/librecms/contentsection/"
-        + "ContentItemManagerTest/data.xml")
+                      + "ContentItemManagerTest/data.xml")
     @ShouldMatchDataSet("datasets/org/librecms/contentsection/"
-        + "ContentItemManagerTest/data.xml")
+                            + "ContentItemManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void copyToFolderInOtherSectionTypeNotPresent() {
         final Optional<ContentItem> source = itemRepo.findById(-10400L);
@@ -717,17 +724,21 @@ public class ContentItemManagerTest {
     @ShouldMatchDataSet(
         value = "datasets/org/librecms/contentsection/"
                     + "ContentItemManagerTest/after-copy-to-same-folder.xml",
-        excludeColumns = {"categorization_id",
+        excludeColumns = {"asset_id",
+                          "attachment_id",
+                          "attachment_list_id",
+                          "categorization_id",
                           "id",
+                          "item_id",
                           "item_uuid",
                           "lifecycle_id",
+                          "list_id",
                           "object_id",
                           "object_order",
                           "phase_id",
-                          "rev",
                           "task_id",
-                          "timestamp",
                           "uuid",
+                          "timestamp",
                           "workflow_id"
         })
     public void copyToSameFolder() {
@@ -796,16 +807,21 @@ public class ContentItemManagerTest {
     @ShouldMatchDataSet(
         value = "datasets/org/librecms/contentsection/"
                     + "ContentItemManagerTest/after-publish.xml",
-        excludeColumns = {"categorization_id",
+        excludeColumns = {"asset_id",
+                          "attachment_id",
+                          "attachment_list_id",
+                          "categorization_id",
                           "id",
+                          "item_id",
+                          "item_uuid",
                           "lifecycle_id",
+                          "list_id",
                           "object_id",
                           "object_order",
                           "phase_id",
-                          "rev",
                           "task_id",
-                          "timestamp",
                           "uuid",
+                          "timestamp",
                           "workflow_id"
         })
     public void publishItem() {
@@ -831,16 +847,21 @@ public class ContentItemManagerTest {
     @ShouldMatchDataSet(
         value = "datasets/org/librecms/contentsection/"
                     + "ContentItemManagerTest/after-publish.xml",
-        excludeColumns = {"categorization_id",
+        excludeColumns = {"asset_id",
+                          "attachment_id",
+                          "attachment_list_id",
+                          "categorization_id",
                           "id",
+                          "item_id",
+                          "item_uuid",
                           "lifecycle_id",
+                          "list_id",
                           "object_id",
                           "object_order",
                           "phase_id",
-                          "rev",
                           "task_id",
-                          "timestamp",
                           "uuid",
+                          "timestamp",
                           "workflow_id"
         })
     public void publishItemWithLifecycle() {
@@ -868,12 +889,11 @@ public class ContentItemManagerTest {
                     + "ContentItemManagerTest/after-republish.xml",
         excludeColumns = {"categorization_id",
                           "id",
+                          "item_uuid",
                           "lifecycle_id",
                           "object_id",
                           "object_order",
                           "phase_id",
-                          "rev",
-                          "revend",
                           "task_id",
                           "timestamp",
                           "uuid",

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

@@ -91,7 +91,7 @@
     
     <ccm_core.ccm_revisions id="0"
                             timestamp="1451602800" />
-    <ccm_core.ccm_revisions id="1"
+    <ccm_core.ccm_revisions id="8"
                             timestamp="1451602800" />
     
     <ccm_core.ccm_objects object_id="-1100"
@@ -139,12 +139,21 @@
     <ccm_core.ccm_objects object_id="-2400"
                           display_name="projects_assets"
                           uuid="8c4e9717-7cae-4f7d-bb25-f3aff793755e" />
+    <ccm_core.ccm_objects object_id="-11100"
+                          display_name="sharedAsset"
+                          uuid="419a03e2-0415-4090-952d-cdc58e5e302c" />
+    <ccm_core.ccm_objects object_id="-11200"
+                          display_name="nonSharedAsset"
+                          uuid="23b0ed3c-e0ea-4a74-817c-eff2b8eeb15f" />
     <ccm_core.ccm_objects object_id="-20300"
                           display_name="org.librecms.contenttypes.Article"
                           uuid="bd061ab6-9c4f-45ff-ab69-f521008eeac3" />
     <ccm_core.ccm_objects object_id="-10110"
                           display_name="article1"
                           uuid="da2524cb-b819-4dd2-987a-9da0faf9ab2b" />
+    <ccm_core.ccm_objects object_id="-11300"
+                          display_name="nonSharedAsset"
+                          uuid="00000000-0000-0000-0000-000000000000" />
     
     <ccm_core.ccm_objects_aud object_id="-10100"
                               rev="0"
@@ -166,10 +175,27 @@
                               rev="0"
                               revtype="0"
                               display_name="news1" />
-    <ccm_core.ccm_objects_aud object_id="-10110"
+    <ccm_core.ccm_objects_aud object_id="-11100"
                               rev="0"
                               revtype="0"
+                              revend="8"
+                              display_name="sharedAsset" />
+    <ccm_core.ccm_objects_aud object_id="-11200"
+                              rev="0"
+                              revtype="0"
+                              display_name="nonSharedAsset" />
+    <ccm_core.ccm_objects_aud object_id="-10110"
+                              rev="8"
+                              revtype="0"
                               display_name="article1" />
+    <ccm_core.ccm_objects_aud object_id="-11100"
+                              rev="8"
+                              revtype="1"
+                              display_name="sharedAsset" />
+    <ccm_core.ccm_objects_aud object_id="-11300"
+                              rev="8"
+                              revtype="0"
+                              display_name="nonSharedAsset" />
     
     <ccm_core.categories object_id="-2100"
                          unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
@@ -342,38 +368,38 @@
     <ccm_cms.content_items object_id="-10110" 
                            item_uuid="da2524cb-b819-4dd2-987a-9da0faf9ab2b"
                            version="DRAFT"
-                           content_type_id="-20100" />
+                           content_type_id="-20300" />
     
-    <ccm_cms.content_items_aud object_id="-10100" 
-                               rev="0"
-                               item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248" 
-                               version="DRAFT" 
-                               content_type_id="-20100" />
-    <ccm_cms.content_items_aud object_id="-10110" 
-                               rev="0"
-                               item_uuid="da2524cb-b819-4dd2-987a-9da0faf9ab2b" 
-                               version="DRAFT" 
-                               content_type_id="-20300" />
-    <ccm_cms.content_items_aud object_id="-10200" 
-                               rev="0"
-                               item_uuid="acae860f-2ffa-450d-b486-054292f0dae6" 
-                               version="DRAFT" 
-                               content_type_id="-20100"/>
     <ccm_cms.content_items_aud object_id="-99200" 
                                rev="0"
                                item_uuid="acae860f-2ffa-450d-b486-054292f0dae6" 
                                version="DRAFT" 
                                content_type_id="-20100"/>
-    <ccm_cms.content_items_aud object_id="-10300" 
-                               rev="0"
-                               item_uuid="f4b38abb-234b-4354-bc92-e36c068a1ebd" 
-                               version="DRAFT" 
-                               content_type_id="-20100"/>
     <ccm_cms.content_items_aud object_id="-10400" 
                                rev="0"
                                item_uuid="d9ea527d-c6e3-4bdd-962d-c0a1a80c6c72" 
                                version="DRAFT" 
                                content_type_id="-20200"/>
+    <ccm_cms.content_items_aud object_id="-10300" 
+                               rev="0"
+                               item_uuid="f4b38abb-234b-4354-bc92-e36c068a1ebd" 
+                               version="DRAFT" 
+                               content_type_id="-20100"/>
+    <ccm_cms.content_items_aud object_id="-10200" 
+                               rev="0"
+                               item_uuid="acae860f-2ffa-450d-b486-054292f0dae6" 
+                               version="DRAFT" 
+                               content_type_id="-20100"/>
+    <ccm_cms.content_items_aud object_id="-10100" 
+                               rev="0"
+                               item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248" 
+                               version="DRAFT" 
+                               content_type_id="-20100" />
+    <ccm_cms.content_items_aud object_id="-10110" 
+                               rev="8"
+                               item_uuid="da2524cb-b819-4dd2-987a-9da0faf9ab2b" 
+                               version="DRAFT" 
+                               content_type_id="-20300" />
 
     <ccm_cms.content_item_names object_id="-10100" 
                                 locale="en" 
@@ -419,7 +445,7 @@
                                     localized_value="news1"
                                     locale="en"
                                     revtype="0" />
-    <ccm_cms.content_item_names_aud rev="0" 
+    <ccm_cms.content_item_names_aud rev="8" 
                                     object_id="-10110"
                                     localized_value="article1"
                                     locale="en"
@@ -469,7 +495,7 @@
                                      localized_value="News 1"
                                      locale="en"
                                      revtype="0" />
-    <ccm_cms.content_item_titles_aud rev="0" 
+    <ccm_cms.content_item_titles_aud rev="8" 
                                      object_id="-10110"
                                      localized_value="Article 1"
                                      locale="en"
@@ -516,7 +542,7 @@
         locale="en" 
         revtype="0" />
     <ccm_cms.article_texts_aud 
-        rev="0" 
+        rev="8" 
         object_id="-10110" 
         localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
         locale="en" 
@@ -549,6 +575,66 @@
         locale="en" 
         localized_value="Curabitur vel sapien eu eros gravida bibendum vitae." />
     
+    <ccm_cms.assets object_id="-11100" />
+    <ccm_cms.assets object_id="-11200" />
+    <ccm_cms.assets object_id="-11300" />
+    
+    <ccm_cms.assets_aud object_id="-11100" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-11200" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-11100" 
+                        rev="8" />
+    <ccm_cms.assets_aud object_id="-11300" 
+                        rev="8" />
+    
+    <ccm_cms.binary_assets object_id="-11100"
+                           filename="sharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    <ccm_cms.binary_assets object_id="-11200"
+                           filename="nonSharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    <ccm_cms.binary_assets object_id="-11300"
+                           filename="nonSharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    
+    <ccm_cms.binary_assets_aud object_id="-11100"
+                               rev="0"
+                               filename="sharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-11200"
+                               rev="0"
+                               filename="nonSharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-11100"
+                               rev="8"
+                               filename="sharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-11300"
+                               rev="8"
+                               filename="nonSharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    
+    <ccm_cms.files object_id="-11100" />
+    <ccm_cms.files object_id="-11200" />
+    <ccm_cms.files object_id="-11300" />
+    
+    <ccm_cms.files_aud object_id="-11100"
+                       rev="0" />
+    <ccm_cms.files_aud object_id="-11200"
+                       rev="0" />
+    <ccm_cms.files_aud object_id="-11100"
+                       rev="8" />
+    <ccm_cms.files_aud object_id="-11300"
+                       rev="8" />
+    
     <ccm_core.categorizations categorization_id="-30100" 
                               category_id="-2110" 
                               object_id="-10100" 
@@ -591,6 +677,89 @@
                               object_order="1" 
                               category_index="false"
                               type="folder" />
+    <ccm_core.categorizations categorization_id="-98300" 
+                              category_id="-2200" 
+                              object_id="-11100" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false" 
+                              type="folder" />
+    
+    <ccm_cms.attachment_lists list_id="-510010"
+                              name="list1"
+                              list_order="1"
+                              uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                              item_id="-10100" />
+    <ccm_cms.attachment_lists list_id="-510020"
+                              name="list1"
+                              list_order="1"
+                              uuid="00000000-0000-0000-0000-000000000000"
+                              item_id="-10500" />
+    
+    <ccm_cms.attachment_lists_aud list_id="-510010"
+                                  rev="0"
+                                  revtype="0"
+                                  name="list1"
+                                  list_order="1"
+                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                                  item_id="-10100" />
+    <ccm_cms.attachment_lists_aud list_id="-510020"
+                                  rev="8"
+                                  revtype="0"
+                                  name="list1"
+                                  list_order="1"
+                                  uuid="00000000-0000-0000-0000-000000000000"
+                                  item_id="-10500" />
+    
+    <ccm_cms.attachments attachment_id="-510110"
+                         sort_key="1"
+                         uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
+                         asset_id="-11100"
+                         attachment_list_id="-510010" />
+    <ccm_cms.attachments attachment_id="-510120"
+                         sort_key="1"
+                         uuid="bfea9877-3300-4000-be99-94258f3e832f"
+                         asset_id="-11200"
+                         attachment_list_id="-510010" />
+    <ccm_cms.attachments attachment_id="-510130"
+                         sort_key="1"
+                         uuid="00000000-0000-0000-0000-000000000000"
+                         asset_id="-11100"
+                         attachment_list_id="-510020" />
+    <ccm_cms.attachments attachment_id="-510140"
+                         sort_key="1"
+                         uuid="00000000-0000-0000-0000-000000000000"
+                         asset_id="-11300"
+                         attachment_list_id="-510020" />
+    
+    <ccm_cms.attachments_aud attachment_id="-510110"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
+                             asset_id="-11100"
+                             attachment_list_id="-510010" />
+    <ccm_cms.attachments_aud attachment_id="-510120"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="bfea9877-3300-4000-be99-94258f3e832f"
+                             asset_id="-11200"
+                             attachment_list_id="-510010" />
+    <ccm_cms.attachments_aud attachment_id="-510130"
+                             rev="8"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="00000000-0000-0000-0000-000000000000"
+                             asset_id="-11100"
+                             attachment_list_id="-510020" />
+    <ccm_cms.attachments_aud attachment_id="-510140"
+                             rev="8"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="00000000-0000-0000-0000-000000000000"
+                             asset_id="-11300"
+                             attachment_list_id="-510020" />
     
     <ccm_core.ccm_roles role_id="-3100"
                         name="info_alert_recipient" />

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

@@ -142,9 +142,18 @@
     <ccm_core.ccm_objects object_id="-2400"
                           display_name="projects_assets"
                           uuid="8c4e9717-7cae-4f7d-bb25-f3aff793755e" />
+    <ccm_core.ccm_objects object_id="-11100"
+                          display_name="sharedAsset"
+                          uuid="419a03e2-0415-4090-952d-cdc58e5e302c" />
+    <ccm_core.ccm_objects object_id="-11200"
+                          display_name="nonSharedAsset"
+                          uuid="23b0ed3c-e0ea-4a74-817c-eff2b8eeb15f" />
     <ccm_core.ccm_objects object_id="-20300"
                           display_name="org.librecms.contenttypes.Article"
                           uuid="bd061ab6-9c4f-45ff-ab69-f521008eeac3" />
+    <ccm_core.ccm_objects object_id="-11300"
+                          display_name="nonSharedAsset"
+                          uuid="00000000-0000-0000-0000-000000000000" />
     
     <ccm_core.ccm_objects_aud object_id="-10100"
                               rev="0"
@@ -166,10 +175,27 @@
                               rev="0"
                               revtype="0"
                               display_name="news1" />
+    <ccm_core.ccm_objects_aud object_id="-11100"
+                              rev="0"
+                              revtype="0"
+                              revend="8"
+                              display_name="sharedAsset" />
+    <ccm_core.ccm_objects_aud object_id="-11200"
+                              rev="0"
+                              revtype="0"
+                              display_name="nonSharedAsset" />
     <ccm_core.ccm_objects_aud object_id="-10500"
-                              rev="1"
+                              rev="8"
                               revtype="0"
                               display_name="article1" />
+    <ccm_core.ccm_objects_aud object_id="-11100"
+                              rev="8"
+                              revtype="1"
+                              display_name="sharedAsset" />
+    <ccm_core.ccm_objects_aud object_id="-11300"
+                              rev="8"
+                              revtype="0"
+                              display_name="nonSharedAsset" />
 
     <ccm_core.categories object_id="-2100"
                          unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
@@ -371,7 +397,7 @@
                                version="DRAFT" 
                                content_type_id="-20200"/>
     <ccm_cms.content_items_aud object_id="-10500"
-                               rev="1"
+                               rev="8"
                                item_uuid="12b63933-3167-4dc5-9b55-726a727c55b1"
                                version="DRAFT"
                                content_type_id="-20100" />
@@ -420,7 +446,7 @@
                                     localized_value="news1"
                                     locale="en"
                                     revtype="0" />
-    <ccm_cms.content_item_names_aud rev="1" 
+    <ccm_cms.content_item_names_aud rev="8" 
                                     object_id="-10500"
                                     localized_value="article1"
                                     locale="en"
@@ -470,7 +496,7 @@
                                      localized_value="News 1"
                                      locale="en"
                                      revtype="0" />
-    <ccm_cms.content_item_titles_aud rev="1" 
+    <ccm_cms.content_item_titles_aud rev="8" 
                                      object_id="-10500"
                                      localized_value="Article 1"
                                      locale="en"
@@ -535,7 +561,7 @@
         locale="en" 
         revtype="0" />
     <ccm_cms.article_texts_aud 
-        rev="1"
+        rev="8"
         object_id="-10500"
         localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis."
         locale="en"
@@ -550,6 +576,66 @@
         locale="en" 
         localized_value="Curabitur vel sapien eu eros gravida bibendum vitae." />
 
+    <ccm_cms.assets object_id="-11100" />
+    <ccm_cms.assets object_id="-11200" />
+    <ccm_cms.assets object_id="-11300" />
+    
+    <ccm_cms.assets_aud object_id="-11100" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-11200" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-11100" 
+                        rev="8" />
+    <ccm_cms.assets_aud object_id="-11300" 
+                        rev="8" />
+    
+    <ccm_cms.binary_assets object_id="-11100"
+                           filename="sharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    <ccm_cms.binary_assets object_id="-11200"
+                           filename="nonSharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    <ccm_cms.binary_assets object_id="-11300"
+                           filename="nonSharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    
+    <ccm_cms.binary_assets_aud object_id="-11100"
+                               rev="0"
+                               filename="sharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-11200"
+                               rev="0"
+                               filename="nonSharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-11100"
+                               rev="8"
+                               filename="sharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-11300"
+                               rev="8"
+                               filename="nonSharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    
+    <ccm_cms.files object_id="-11100" />
+    <ccm_cms.files object_id="-11200" />
+    <ccm_cms.files object_id="-11300" />
+    
+    <ccm_cms.files_aud object_id="-11100"
+                       rev="0" />
+    <ccm_cms.files_aud object_id="-11200"
+                       rev="0" />
+    <ccm_cms.files_aud object_id="-11100"
+                       rev="8" />
+    <ccm_cms.files_aud object_id="-11300"
+                       rev="8" />
+    
     <ccm_core.categorizations categorization_id="-30100" 
                               category_id="-2110" 
                               object_id="-10100" 
@@ -592,6 +678,89 @@
                               object_order="2" 
                               category_index="false" 
                               type="folder" />
+    <ccm_core.categorizations categorization_id="-98300" 
+                              category_id="-2200" 
+                              object_id="-11100" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false" 
+                              type="folder" />
+    
+    <ccm_cms.attachment_lists list_id="-510010"
+                              name="list1"
+                              list_order="1"
+                              uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                              item_id="-10100" />
+    <ccm_cms.attachment_lists list_id="-510020"
+                              name="list1"
+                              list_order="1"
+                              uuid="00000000-0000-0000-0000-000000000000"
+                              item_id="-10500" />
+    
+    <ccm_cms.attachment_lists_aud list_id="-510010"
+                                  rev="0"
+                                  revtype="0"
+                                  name="list1"
+                                  list_order="1"
+                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                                  item_id="-10100" />
+    <ccm_cms.attachment_lists_aud list_id="-510020"
+                                  rev="8"
+                                  revtype="0"
+                                  name="list1"
+                                  list_order="1"
+                                  uuid="00000000-0000-0000-0000-000000000000"
+                                  item_id="-10500" />
+    
+    <ccm_cms.attachments attachment_id="-510110"
+                         sort_key="1"
+                         uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
+                         asset_id="-11100"
+                         attachment_list_id="-510010" />
+    <ccm_cms.attachments attachment_id="-510120"
+                         sort_key="1"
+                         uuid="bfea9877-3300-4000-be99-94258f3e832f"
+                         asset_id="-11200"
+                         attachment_list_id="-510010" />
+    <ccm_cms.attachments attachment_id="-510130"
+                         sort_key="1"
+                         uuid="00000000-0000-0000-0000-000000000000"
+                         asset_id="-11100"
+                         attachment_list_id="-510020" />
+    <ccm_cms.attachments attachment_id="-510140"
+                         sort_key="1"
+                         uuid="00000000-0000-0000-0000-000000000000"
+                         asset_id="-11300"
+                         attachment_list_id="-510020" />
+    
+    <ccm_cms.attachments_aud attachment_id="-510110"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
+                             asset_id="-11100"
+                             attachment_list_id="-510010" />
+    <ccm_cms.attachments_aud attachment_id="-510120"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="bfea9877-3300-4000-be99-94258f3e832f"
+                             asset_id="-11200"
+                             attachment_list_id="-510010" />
+    <ccm_cms.attachments_aud attachment_id="-510130"
+                             rev="8"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="00000000-0000-0000-0000-000000000000"
+                             asset_id="-11100"
+                             attachment_list_id="-510020" />
+    <ccm_cms.attachments_aud attachment_id="-510140"
+                             rev="8"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="00000000-0000-0000-0000-000000000000"
+                             asset_id="-11300"
+                             attachment_list_id="-510020" />
     
     <ccm_core.ccm_roles role_id="-3100"
                         name="info_alert_recipient" />

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

@@ -91,10 +91,9 @@
     
     <ccm_core.ccm_revisions id="0"
                             timestamp="1451602800" />
-    <ccm_core.ccm_revisions id="1"
+    <ccm_core.ccm_revisions id="8"
                             timestamp="1451602800" />
 
-
     <ccm_core.ccm_objects object_id="-1100"
                           display_name="info"
                           uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
@@ -143,9 +142,18 @@
     <ccm_core.ccm_objects object_id="-2400"
                           display_name="projects_assets"
                           uuid="8c4e9717-7cae-4f7d-bb25-f3aff793755e" />
+    <ccm_core.ccm_objects object_id="-11100"
+                          display_name="sharedAsset"
+                          uuid="419a03e2-0415-4090-952d-cdc58e5e302c" />
+    <ccm_core.ccm_objects object_id="-11200"
+                          display_name="nonSharedAsset"
+                          uuid="23b0ed3c-e0ea-4a74-817c-eff2b8eeb15f" />
     <ccm_core.ccm_objects object_id="-20300"
                           display_name="org.librecms.contenttypes.Article"
                           uuid="bd061ab6-9c4f-45ff-ab69-f521008eeac3" />
+    <ccm_core.ccm_objects object_id="-11300"
+                          display_name="nonSharedAsset"
+                          uuid="00000000-0000-0000-0000-000000000000" />
     
     <ccm_core.ccm_objects_aud object_id="-10100"
                               rev="0"
@@ -167,10 +175,27 @@
                               rev="0"
                               revtype="0"
                               display_name="news1" />
+    <ccm_core.ccm_objects_aud object_id="-11100"
+                              rev="0"
+                              revtype="0"
+                              revend="8"
+                              display_name="sharedAsset" />
+    <ccm_core.ccm_objects_aud object_id="-11200"
+                              rev="0"
+                              revtype="0"
+                              display_name="nonSharedAsset" />
     <ccm_core.ccm_objects_aud object_id="-10500"
-                              rev="1"
+                              rev="8"
                               revtype="0"
                               display_name="article1_copy1" />
+    <ccm_core.ccm_objects_aud object_id="-11100"
+                                  rev="8"
+                                  revtype="1"
+                                  display_name="sharedAsset" />
+    <ccm_core.ccm_objects_aud object_id="-11300"
+                              rev="8"
+                              revtype="0"
+                              display_name="nonSharedAsset" />
     
     <ccm_core.categories object_id="-2100"
                          unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
@@ -371,7 +396,7 @@
                                version="DRAFT" 
                                content_type_id="-20200"/>
     <ccm_cms.content_items_aud object_id="-10500"
-                               rev="1"
+                               rev="8"
                                item_uuid="12b63933-3167-4dc5-9b55-726a727c55b1"
                                version="DRAFT"
                                content_type_id="-20100" />
@@ -420,7 +445,7 @@
                                     localized_value="news1"
                                     locale="en"
                                     revtype="0" />
-    <ccm_cms.content_item_names_aud rev="1"
+    <ccm_cms.content_item_names_aud rev="8"
                                     object_id="-10500"
                                     localized_value="article1"
                                     locale="en"
@@ -470,7 +495,7 @@
                                      localized_value="News 1"
                                      locale="en"
                                      revtype="0" />
-    <ccm_cms.content_item_titles_aud rev="1"
+    <ccm_cms.content_item_titles_aud rev="8"
                                      object_id="-10500"
                                      localized_value="Article 1"
                                      locale="en"
@@ -535,7 +560,7 @@
         locale="en" 
         revtype="0" />
     <ccm_cms.article_texts_aud 
-        rev="1" 
+        rev="8" 
         object_id="-10500" 
         localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
         locale="en" 
@@ -550,6 +575,66 @@
         locale="en" 
         localized_value="Curabitur vel sapien eu eros gravida bibendum vitae." />
     
+    <ccm_cms.assets object_id="-11100" />
+    <ccm_cms.assets object_id="-11200" />
+    <ccm_cms.assets object_id="-11300" />
+    
+    <ccm_cms.assets_aud object_id="-11100" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-11200" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-11100" 
+                        rev="8" />
+    <ccm_cms.assets_aud object_id="-11300" 
+                        rev="8" />
+    
+    <ccm_cms.binary_assets object_id="-11100"
+                           filename="sharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    <ccm_cms.binary_assets object_id="-11200"
+                           filename="nonSharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    <ccm_cms.binary_assets object_id="-11300"
+                           filename="nonSharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    
+    <ccm_cms.binary_assets_aud object_id="-11100"
+                               rev="0"
+                               filename="sharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-11200"
+                               rev="0"
+                               filename="nonSharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-11100"
+                               rev="8"
+                               filename="sharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-11300"
+                               rev="8"
+                               filename="nonSharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    
+    <ccm_cms.files object_id="-11100" />
+    <ccm_cms.files object_id="-11200" />
+    <ccm_cms.files object_id="-11300" />
+    
+    <ccm_cms.files_aud object_id="-11100"
+                       rev="0" />
+    <ccm_cms.files_aud object_id="-11200"
+                       rev="0" />
+    <ccm_cms.files_aud object_id="-11100"
+                       rev="8" />
+    <ccm_cms.files_aud object_id="-11300"
+                       rev="8" />
+
     <ccm_core.categorizations categorization_id="-30100" 
                               category_id="-2110" 
                               object_id="-10100" 
@@ -592,6 +677,89 @@
                               object_order="2" 
                               category_index="false" 
                               type="folder" />
+    <ccm_core.categorizations categorization_id="-98300" 
+                              category_id="-2200" 
+                              object_id="-11100" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false" 
+                              type="folder" />
+    
+    <ccm_cms.attachment_lists list_id="-510010"
+                              name="list1"
+                              list_order="1"
+                              uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                              item_id="-10100" />
+    <ccm_cms.attachment_lists list_id="-510020"
+                              name="list1"
+                              list_order="1"
+                              uuid="00000000-0000-0000-0000-000000000000"
+                              item_id="-10500" />
+    
+    <ccm_cms.attachment_lists_aud list_id="-510010"
+                                  rev="0"
+                                  revtype="0"
+                                  name="list1"
+                                  list_order="1"
+                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                                  item_id="-10100" />
+    <ccm_cms.attachment_lists_aud list_id="-510020"
+                                  rev="8"
+                                  revtype="0"
+                                  name="list1"
+                                  list_order="1"
+                                  uuid="00000000-0000-0000-0000-000000000000"
+                                  item_id="-10500" />
+    
+    <ccm_cms.attachments attachment_id="-510110"
+                         sort_key="1"
+                         uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
+                         asset_id="-11100"
+                         attachment_list_id="-510010" />
+    <ccm_cms.attachments attachment_id="-510120"
+                         sort_key="1"
+                         uuid="bfea9877-3300-4000-be99-94258f3e832f"
+                         asset_id="-11200"
+                         attachment_list_id="-510010" />
+    <ccm_cms.attachments attachment_id="-510130"
+                         sort_key="1"
+                         uuid="00000000-0000-0000-0000-000000000000"
+                         asset_id="-11100"
+                         attachment_list_id="-510020" />
+    <ccm_cms.attachments attachment_id="-510140"
+                         sort_key="1"
+                         uuid="00000000-0000-0000-0000-000000000000"
+                         asset_id="-11300"
+                         attachment_list_id="-510020" />
+    
+    <ccm_cms.attachments_aud attachment_id="-510110"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
+                             asset_id="-11100"
+                             attachment_list_id="-510010" />
+    <ccm_cms.attachments_aud attachment_id="-510120"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="bfea9877-3300-4000-be99-94258f3e832f"
+                             asset_id="-11200"
+                             attachment_list_id="-510010" />
+    <ccm_cms.attachments_aud attachment_id="-510130"
+                             rev="8"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="00000000-0000-0000-0000-000000000000"
+                             asset_id="-11100"
+                             attachment_list_id="-510020" />
+    <ccm_cms.attachments_aud attachment_id="-510140"
+                             rev="8"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="00000000-0000-0000-0000-000000000000"
+                             asset_id="-11300"
+                             attachment_list_id="-510020" />
     
     <ccm_core.ccm_roles role_id="-3100"
                         name="info_alert_recipient" />

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

@@ -153,7 +153,7 @@
     <ccm_core.ccm_objects object_id="-20200"
                           display_name="org.librecms.contenttypes.News"
                           uuid="47740f22-f89f-4ec3-90cf-d62859e53c7e" />
-    <ccm_core.ccm_objects object_id="-11100"
+    <ccm_core.ccm_objects object_id="-12100"
                           display_name="new-article"
                           uuid="cfa0efb6-7ce2-41e8-be03-4ee8c7f18b05" />
     <ccm_core.ccm_objects object_id="-1200" 
@@ -165,6 +165,12 @@
     <ccm_core.ccm_objects object_id="-2400"
                           display_name="projects_assets"
                           uuid="8c4e9717-7cae-4f7d-bb25-f3aff793755e" />
+    <ccm_core.ccm_objects object_id="-11100"
+                          display_name="sharedAsset"
+                          uuid="419a03e2-0415-4090-952d-cdc58e5e302c" />
+    <ccm_core.ccm_objects object_id="-11200"
+                          display_name="nonSharedAsset"
+                          uuid="23b0ed3c-e0ea-4a74-817c-eff2b8eeb15f" />
     <ccm_core.ccm_objects object_id="-20300"
                           display_name="org.librecms.contenttypes.Article"
                           uuid="bd061ab6-9c4f-45ff-ab69-f521008eeac3" />
@@ -190,6 +196,14 @@
                               revtype="0"
                               display_name="news1" />
     <ccm_core.ccm_objects_aud object_id="-11100"
+                              rev="0"
+                              revtype="0"
+                              display_name="sharedAsset" />
+    <ccm_core.ccm_objects_aud object_id="-11200"
+                              rev="0"
+                              revtype="0"
+                              display_name="nonSharedAsset" />
+    <ccm_core.ccm_objects_aud object_id="-12100"
                               rev="1"
                               revtype="0"
                               display_name="new-article" />
@@ -358,7 +372,7 @@
                            item_uuid="d9ea527d-c6e3-4bdd-962d-c0a1a80c6c72"
                            version="DRAFT"
                            content_type_id="-20200" />
-    <ccm_cms.content_items object_id="-11100" 
+    <ccm_cms.content_items object_id="-12100" 
                            item_uuid="cfa0efb6-7ce2-41e8-be03-4ee8c7f18b05"
                            version="DRAFT"
                            content_type_id="-20100" 
@@ -393,7 +407,7 @@
                                item_uuid="d9ea527d-c6e3-4bdd-962d-c0a1a80c6c72" 
                                version="DRAFT" 
                                content_type_id="-20200"/>
-    <ccm_cms.content_items_aud object_id="-11100"
+    <ccm_cms.content_items_aud object_id="-12100"
                                rev="1"
                                item_uuid="cfa0efb6-7ce2-41e8-be03-4ee8c7f18b05"
                                version="DRAFT"
@@ -411,7 +425,7 @@
     <ccm_cms.content_item_names object_id="-10400" 
                                 locale="en" 
                                 localized_value="news1" />
-    <ccm_cms.content_item_names object_id="-11100" 
+    <ccm_cms.content_item_names object_id="-12100" 
                                 locale="en" 
                                 localized_value="new-article" />
     <ccm_cms.content_item_names object_id="-99200" 
@@ -444,7 +458,7 @@
                                     locale="en"
                                     revtype="0" />
     <ccm_cms.content_item_names_aud rev="1"
-                                    object_id="-11100"
+                                    object_id="-12100"
                                     localized_value="new-article"
                                     locale="en"
                                     revtype="0" />
@@ -501,7 +515,7 @@
     <ccm_cms.articles object_id="-10100" />
     <ccm_cms.articles object_id="-10200" />
     <ccm_cms.articles object_id="-10300" />
-    <ccm_cms.articles object_id="-11100" />
+    <ccm_cms.articles object_id="-12100" />
     <ccm_cms.articles object_id="-99200" />
     
     <ccm_cms.article_texts 
@@ -555,6 +569,42 @@
         locale="en" 
         localized_value="Curabitur vel sapien eu eros gravida bibendum vitae." />
     
+        <ccm_cms.assets object_id="-11100" />
+    <ccm_cms.assets object_id="-11200" />
+    
+    <ccm_cms.assets_aud object_id="-11100" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-11200" 
+                        rev="0" />
+    
+    <ccm_cms.binary_assets object_id="-11100"
+                           filename="sharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    <ccm_cms.binary_assets object_id="-11200"
+                           filename="nonSharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    
+    <ccm_cms.binary_assets_aud object_id="-11100"
+                               rev="0"
+                               filename="sharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-11200"
+                               rev="0"
+                               filename="nonSharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    
+    <ccm_cms.files object_id="-11100" />
+    <ccm_cms.files object_id="-11200" />
+    
+    <ccm_cms.files_aud object_id="-11100"
+                       rev="0" />
+    <ccm_cms.files_aud object_id="-11200"
+                       rev="0" />
+    
     <ccm_core.categorizations categorization_id="-30100" 
                               category_id="-2110" 
                               object_id="-10100" 
@@ -585,7 +635,7 @@
                               type="folder" />
     <ccm_core.categorizations categorization_id="-30500" 
                               category_id="-2100" 
-                              object_id="-11100" 
+                              object_id="-12100" 
                               category_order="1" 
                               object_order="1" 
                               category_index="false"
@@ -597,6 +647,53 @@
                               object_order="2" 
                               category_index="false" 
                               type="folder" />
+    <ccm_core.categorizations categorization_id="-98300" 
+                              category_id="-2200" 
+                              object_id="-11100" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false" 
+                              type="folder" />
+    
+    <ccm_cms.attachment_lists list_id="-510010"
+                              name="list1"
+                              list_order="1"
+                              uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                              item_id="-10100" />
+    
+    <ccm_cms.attachment_lists_aud list_id="-510010"
+                                  rev="0"
+                                  revtype="0"
+                                  name="list1"
+                                  list_order="1"
+                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                                  item_id="-10100" />
+    
+    <ccm_cms.attachments attachment_id="-510110"
+                         sort_key="1"
+                         uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
+                         asset_id="-11100"
+                         attachment_list_id="-510010" />
+    <ccm_cms.attachments attachment_id="-510120"
+                         sort_key="1"
+                         uuid="bfea9877-3300-4000-be99-94258f3e832f"
+                         asset_id="-11200"
+                         attachment_list_id="-510010" />
+    
+    <ccm_cms.attachments_aud attachment_id="-510110"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
+                             asset_id="-11100"
+                             attachment_list_id="-510010" />
+    <ccm_cms.attachments_aud attachment_id="-510120"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="bfea9877-3300-4000-be99-94258f3e832f"
+                             asset_id="-11200"
+                             attachment_list_id="-510010" />
     
     <ccm_core.ccm_roles role_id="-3100"
                         name="info_alert_recipient" />

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

@@ -166,7 +166,7 @@
     <ccm_core.ccm_objects object_id="-20200"
                           display_name="org.librecms.contenttypes.News"
                           uuid="47740f22-f89f-4ec3-90cf-d62859e53c7e" />
-    <ccm_core.ccm_objects object_id="-11100"
+    <ccm_core.ccm_objects object_id="-12100"
                           display_name="new-article"
                           uuid="cfa0efb6-7ce2-41e8-be03-4ee8c7f18b05" />
     <ccm_core.ccm_objects object_id="-1200" 
@@ -178,6 +178,12 @@
     <ccm_core.ccm_objects object_id="-2400"
                           display_name="projects_assets"
                           uuid="8c4e9717-7cae-4f7d-bb25-f3aff793755e" />
+    <ccm_core.ccm_objects object_id="-11100"
+                          display_name="sharedAsset"
+                          uuid="419a03e2-0415-4090-952d-cdc58e5e302c" />
+    <ccm_core.ccm_objects object_id="-11200"
+                          display_name="nonSharedAsset"
+                          uuid="23b0ed3c-e0ea-4a74-817c-eff2b8eeb15f" />
     <ccm_core.ccm_objects object_id="-20300"
                           display_name="org.librecms.contenttypes.Article"
                           uuid="bd061ab6-9c4f-45ff-ab69-f521008eeac3" />
@@ -203,6 +209,14 @@
                               revtype="0"
                               display_name="news1" />
     <ccm_core.ccm_objects_aud object_id="-11100"
+                              rev="0"
+                              revtype="0"
+                              display_name="sharedAsset" />
+    <ccm_core.ccm_objects_aud object_id="-11200"
+                              rev="0"
+                              revtype="0"
+                              display_name="nonSharedAsset" />
+    <ccm_core.ccm_objects_aud object_id="-12100"
                               rev="1"
                               revtype="0"
                               display_name="new-article" />
@@ -371,7 +385,7 @@
                            item_uuid="d9ea527d-c6e3-4bdd-962d-c0a1a80c6c72"
                            version="DRAFT"
                            content_type_id="-20200" />
-    <ccm_cms.content_items object_id="-11100" 
+    <ccm_cms.content_items object_id="-12100" 
                            item_uuid="cfa0efb6-7ce2-41e8-be03-4ee8c7f18b05"
                            version="DRAFT"
                            content_type_id="-20100" 
@@ -406,7 +420,7 @@
                                item_uuid="d9ea527d-c6e3-4bdd-962d-c0a1a80c6c72" 
                                version="DRAFT" 
                                content_type_id="-20200"/>
-    <ccm_cms.content_items_aud object_id="-11100"
+    <ccm_cms.content_items_aud object_id="-12100"
                                rev="1"
                                item_uuid="cfa0efb6-7ce2-41e8-be03-4ee8c7f18b05"
                                version="DRAFT"
@@ -424,7 +438,7 @@
     <ccm_cms.content_item_names object_id="-10400" 
                                 locale="en" 
                                 localized_value="news1" />
-    <ccm_cms.content_item_names object_id="-11100" 
+    <ccm_cms.content_item_names object_id="-12100" 
                                 locale="en" 
                                 localized_value="new-article" />
     <ccm_cms.content_item_names object_id="-99200" 
@@ -457,7 +471,7 @@
                                     locale="en"
                                     revtype="0" />
     <ccm_cms.content_item_names_aud rev="1"
-                                    object_id="-11100"
+                                    object_id="-12100"
                                     localized_value="new-article"
                                     locale="en"
                                     revtype="0" />
@@ -514,7 +528,7 @@
     <ccm_cms.articles object_id="-10100" />
     <ccm_cms.articles object_id="-10200" />
     <ccm_cms.articles object_id="-10300" />
-    <ccm_cms.articles object_id="-11100" />
+    <ccm_cms.articles object_id="-12100" />
     <ccm_cms.articles object_id="-99200" />
     
     <ccm_cms.article_texts 
@@ -568,6 +582,42 @@
         locale="en" 
         localized_value="Curabitur vel sapien eu eros gravida bibendum vitae." />
     
+    <ccm_cms.assets object_id="-11100" />
+    <ccm_cms.assets object_id="-11200" />
+    
+    <ccm_cms.assets_aud object_id="-11100" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-11200" 
+                        rev="0" />
+    
+    <ccm_cms.binary_assets object_id="-11100"
+                           filename="sharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    <ccm_cms.binary_assets object_id="-11200"
+                           filename="nonSharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    
+    <ccm_cms.binary_assets_aud object_id="-11100"
+                               rev="0"
+                               filename="sharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-11200"
+                               rev="0"
+                               filename="nonSharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    
+    <ccm_cms.files object_id="-11100" />
+    <ccm_cms.files object_id="-11200" />
+    
+    <ccm_cms.files_aud object_id="-11100"
+                       rev="0" />
+    <ccm_cms.files_aud object_id="-11200"
+                       rev="0" />
+        
     <ccm_core.categorizations categorization_id="-30100" 
                               category_id="-2110" 
                               object_id="-10100" 
@@ -598,7 +648,7 @@
                               type="folder" />
     <ccm_core.categorizations categorization_id="-30500" 
                               category_id="-2100" 
-                              object_id="-11100" 
+                              object_id="-12100" 
                               category_order="1" 
                               object_order="1" 
                               category_index="false"
@@ -610,6 +660,53 @@
                               object_order="2" 
                               category_index="false" 
                               type="folder" />
+    <ccm_core.categorizations categorization_id="-98300" 
+                              category_id="-2200" 
+                              object_id="-11100" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false" 
+                              type="folder" />
+    
+    <ccm_cms.attachment_lists list_id="-510010"
+                              name="list1"
+                              list_order="1"
+                              uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                              item_id="-10100" />
+    
+    <ccm_cms.attachment_lists_aud list_id="-510010"
+                                  rev="0"
+                                  revtype="0"
+                                  name="list1"
+                                  list_order="1"
+                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                                  item_id="-10100" />
+    
+    <ccm_cms.attachments attachment_id="-510110"
+                         sort_key="1"
+                         uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
+                         asset_id="-11100"
+                         attachment_list_id="-510010" />
+    <ccm_cms.attachments attachment_id="-510120"
+                         sort_key="1"
+                         uuid="bfea9877-3300-4000-be99-94258f3e832f"
+                         asset_id="-11200"
+                         attachment_list_id="-510010" />
+    
+    <ccm_cms.attachments_aud attachment_id="-510110"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
+                             asset_id="-11100"
+                             attachment_list_id="-510010" />
+    <ccm_cms.attachments_aud attachment_id="-510120"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="bfea9877-3300-4000-be99-94258f3e832f"
+                             asset_id="-11200"
+                             attachment_list_id="-510010" />
     
     <ccm_core.ccm_roles role_id="-3100"
                         name="info_alert_recipient" />

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

@@ -137,6 +137,12 @@
     <ccm_core.ccm_objects object_id="-2400"
                           display_name="projects_assets"
                           uuid="8c4e9717-7cae-4f7d-bb25-f3aff793755e" />
+    <ccm_core.ccm_objects object_id="-11100"
+                              display_name="sharedAsset"
+                              uuid="419a03e2-0415-4090-952d-cdc58e5e302c" />
+    <ccm_core.ccm_objects object_id="-11200"
+                          display_name="nonSharedAsset"
+                          uuid="23b0ed3c-e0ea-4a74-817c-eff2b8eeb15f" />
     <ccm_core.ccm_objects object_id="-20300"
                           display_name="org.librecms.contenttypes.Article"
                           uuid="bd061ab6-9c4f-45ff-ab69-f521008eeac3" />
@@ -161,6 +167,14 @@
                               rev="0"
                               revtype="0"
                               display_name="news1" />
+    <ccm_core.ccm_objects_aud object_id="-11100"
+                              rev="0"
+                              revtype="0"
+                              display_name="sharedAsset" />
+    <ccm_core.ccm_objects_aud object_id="-11200"
+                              rev="0"
+                              revtype="0"
+                              display_name="nonSharedAsset" />
     
     <ccm_core.categories object_id="-2100"
                          unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
@@ -504,6 +518,42 @@
         locale="en" 
         localized_value="Curabitur vel sapien eu eros gravida bibendum vitae." />
     
+    <ccm_cms.assets object_id="-11100" />
+    <ccm_cms.assets object_id="-11200" />
+    
+    <ccm_cms.assets_aud object_id="-11100" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-11200" 
+                        rev="0" />
+    
+    <ccm_cms.binary_assets object_id="-11100"
+                           filename="sharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    <ccm_cms.binary_assets object_id="-11200"
+                           filename="nonSharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    
+    <ccm_cms.binary_assets_aud object_id="-11100"
+                               rev="0"
+                               filename="sharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-11200"
+                               rev="0"
+                               filename="nonSharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    
+    <ccm_cms.files object_id="-11100" />
+    <ccm_cms.files object_id="-11200" />
+    
+    <ccm_cms.files_aud object_id="-11100"
+                       rev="0" />
+    <ccm_cms.files_aud object_id="-11200"
+                       rev="0" />
+    
     <ccm_core.categorizations categorization_id="-30100" 
                               category_id="-2300" 
                               object_id="-10100" 
@@ -539,6 +589,53 @@
                               object_order="2" 
                               category_index="false" 
                               type="folder" />
+    <ccm_core.categorizations categorization_id="-98300" 
+                              category_id="-2200" 
+                              object_id="-11100" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false" 
+                              type="folder" />
+    
+    <ccm_cms.attachment_lists list_id="-510010"
+                              name="list1"
+                              list_order="1"
+                              uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                              item_id="-10100" />
+    
+    <ccm_cms.attachment_lists_aud list_id="-510010"
+                                  rev="0"
+                                  revtype="0"
+                                  name="list1"
+                                  list_order="1"
+                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                                  item_id="-10100" />
+    
+    <ccm_cms.attachments attachment_id="-510110"
+                         sort_key="1"
+                         uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
+                         asset_id="-11100"
+                         attachment_list_id="-510010" />
+    <ccm_cms.attachments attachment_id="-510120"
+                         sort_key="1"
+                         uuid="bfea9877-3300-4000-be99-94258f3e832f"
+                         asset_id="-11200"
+                         attachment_list_id="-510010" />
+    
+    <ccm_cms.attachments_aud attachment_id="-510110"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
+                             asset_id="-11100"
+                             attachment_list_id="-510010" />
+    <ccm_cms.attachments_aud attachment_id="-510120"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="bfea9877-3300-4000-be99-94258f3e832f"
+                             asset_id="-11200"
+                             attachment_list_id="-510010" />
 
     <ccm_core.ccm_roles role_id="-3100"
                         name="info_alert_recipient" />

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

@@ -137,6 +137,12 @@
     <ccm_core.ccm_objects object_id="-2400"
                           display_name="projects_assets"
                           uuid="8c4e9717-7cae-4f7d-bb25-f3aff793755e" />
+    <ccm_core.ccm_objects object_id="-11100"
+                          display_name="sharedAsset"
+                          uuid="419a03e2-0415-4090-952d-cdc58e5e302c" />
+    <ccm_core.ccm_objects object_id="-11200"
+                          display_name="nonSharedAsset"
+                          uuid="23b0ed3c-e0ea-4a74-817c-eff2b8eeb15f" />
     <ccm_core.ccm_objects object_id="-20300"
                           display_name="org.librecms.contenttypes.Article"
                           uuid="bd061ab6-9c4f-45ff-ab69-f521008eeac3" />
@@ -161,6 +167,14 @@
                               rev="0"
                               revtype="0"
                               display_name="news1" />
+    <ccm_core.ccm_objects_aud object_id="-11100"
+                              rev="0"
+                              revtype="0"
+                              display_name="sharedAsset" />
+    <ccm_core.ccm_objects_aud object_id="-11200"
+                              rev="0"
+                              revtype="0"
+                              display_name="nonSharedAsset" />
     
     <ccm_core.categories object_id="-2100"
                          unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
@@ -505,6 +519,42 @@
         locale="en" 
         localized_value="Curabitur vel sapien eu eros gravida bibendum vitae." />
 
+    <ccm_cms.assets object_id="-11100" />
+    <ccm_cms.assets object_id="-11200" />
+    
+    <ccm_cms.assets_aud object_id="-11100" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-11200" 
+                        rev="0" />
+    
+    <ccm_cms.binary_assets object_id="-11100"
+                           filename="sharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    <ccm_cms.binary_assets object_id="-11200"
+                           filename="nonSharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    
+    <ccm_cms.binary_assets_aud object_id="-11100"
+                               rev="0"
+                               filename="sharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-11200"
+                               rev="0"
+                               filename="nonSharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    
+    <ccm_cms.files object_id="-11100" />
+    <ccm_cms.files object_id="-11200" />
+    
+    <ccm_cms.files_aud object_id="-11100"
+                       rev="0" />
+    <ccm_cms.files_aud object_id="-11200"
+                       rev="0" />
+    
     <ccm_core.categorizations categorization_id="-30100" 
                               category_id="-2120" 
                               object_id="-10100" 
@@ -540,6 +590,53 @@
                               object_order="2" 
                               category_index="false" 
                               type="folder" />
+    <ccm_core.categorizations categorization_id="-98300" 
+                              category_id="-2200" 
+                              object_id="-11100" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false" 
+                              type="folder" />
+    
+    <ccm_cms.attachment_lists list_id="-510010"
+                              name="list1"
+                              list_order="1"
+                              uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                              item_id="-10100" />
+    
+    <ccm_cms.attachment_lists_aud list_id="-510010"
+                                  rev="0"
+                                  revtype="0"
+                                  name="list1"
+                                  list_order="1"
+                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                                  item_id="-10100" />
+    
+    <ccm_cms.attachments attachment_id="-510110"
+                         sort_key="1"
+                         uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
+                         asset_id="-11100"
+                         attachment_list_id="-510010" />
+    <ccm_cms.attachments attachment_id="-510120"
+                         sort_key="1"
+                         uuid="bfea9877-3300-4000-be99-94258f3e832f"
+                         asset_id="-11200"
+                         attachment_list_id="-510010" />
+    
+    <ccm_cms.attachments_aud attachment_id="-510110"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
+                             asset_id="-11100"
+                             attachment_list_id="-510010" />
+    <ccm_cms.attachments_aud attachment_id="-510120"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="bfea9877-3300-4000-be99-94258f3e832f"
+                             asset_id="-11200"
+                             attachment_list_id="-510010" />
     
     <ccm_core.ccm_roles role_id="-3100"
                         name="info_alert_recipient" />
@@ -749,10 +846,10 @@
                           creation_date="2016-07-15"/>
 
     <ccm_core.permissions permission_id="-4710" 
-                              granted_privilege="categorize_items" 
+                          granted_privilege="categorize_items" 
-                              object_id="-2300" 
+                          object_id="-2300" 
-                              grantee_id="-3200" 
+                          grantee_id="-3200" 
-                              creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"/>
     <ccm_core.permissions permission_id="-4720" 
                           granted_privilege="create_new_items" 
                           object_id="-2300" 

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

@@ -142,9 +142,18 @@
     <ccm_core.ccm_objects object_id="-2400"
                           display_name="projects_assets"
                           uuid="8c4e9717-7cae-4f7d-bb25-f3aff793755e" />
+    <ccm_core.ccm_objects object_id="-11100"
+                          display_name="sharedAsset"
+                          uuid="419a03e2-0415-4090-952d-cdc58e5e302c" />
+    <ccm_core.ccm_objects object_id="-11200"
+                          display_name="nonSharedAsset"
+                          uuid="23b0ed3c-e0ea-4a74-817c-eff2b8eeb15f" />
     <ccm_core.ccm_objects object_id="-20300"
                           display_name="org.librecms.contenttypes.Article"
                           uuid="bd061ab6-9c4f-45ff-ab69-f521008eeac3" />
+    <ccm_core.ccm_objects object_id="-11300"
+                              display_name="nonSharedAsset"
+                              uuid="00000000-0000-0000-0000-000000000000" />
     
     <ccm_core.ccm_objects_aud object_id="-10100"
                               rev="0"
@@ -166,10 +175,27 @@
                               rev="0"
                               revtype="0"
                               display_name="news1" />
+    <ccm_core.ccm_objects_aud object_id="-11100"
+                              rev="0"
+                              revtype="0"
+                              revend="10"
+                              display_name="sharedAsset" />
+    <ccm_core.ccm_objects_aud object_id="-11200"
+                              rev="0"
+                              revtype="0"
+                              display_name="nonSharedAsset" />
     <ccm_core.ccm_objects_aud object_id="-99100" 
-                              rev="1"
+                              rev="10"
                               revtype="0"
                               display_name="article1" />
+        <ccm_core.ccm_objects_aud object_id="-11100"
+                              rev="10"
+                              revtype="1"
+                              display_name="sharedAsset" />
+    <ccm_core.ccm_objects_aud object_id="-11300"
+                              rev="10"
+                              revtype="0"
+                              display_name="nonSharedAsset" />
 
     <ccm_core.categories object_id="-2100"
                          unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
@@ -238,8 +264,8 @@
                               locale="en"
                               localized_value="info" />
     <ccm_core.resource_titles object_id="-1200" 
-                                  locale="en"
+                              locale="en"
-                                  localized_value="projects" />
+                              localized_value="projects" />
     
     <ccm_core.applications object_id="-1100"
                            application_type="org.librecms.contentsection.ContentSection"
@@ -370,11 +396,12 @@
                                version="DRAFT" 
                                content_type_id="-20200"/>
     <ccm_cms.content_items_aud object_id="-99100" 
-                               rev="1"
+                               rev="10"
                                item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248"
                                version="LIVE"
                                content_type_id="-20100" />
     
+
     <ccm_cms.content_item_names object_id="-10100" 
                                 locale="en" 
                                 localized_value="article1" />
@@ -419,7 +446,7 @@
                                     localized_value="news1"
                                     locale="en"
                                     revtype="0" />
-    <ccm_cms.content_item_names_aud rev="1"
+    <ccm_cms.content_item_names_aud rev="10"
                                     object_id="-99100"
                                     localized_value="article1"
                                     locale="en"
@@ -469,7 +496,7 @@
                                      localized_value="News 1"
                                      locale="en"
                                      revtype="0" />
-    <ccm_cms.content_item_titles_aud rev="1" 
+    <ccm_cms.content_item_titles_aud rev="10" 
                                      object_id="-99100"
                                      localized_value="Article 1"
                                      locale="en"
@@ -534,7 +561,7 @@
         locale="en" 
         revtype="0" />
     <ccm_cms.article_texts_aud 
-        rev="1"
+        rev="10"
         object_id="-99100"
         localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis."
         locale="en"
@@ -549,6 +576,66 @@
         locale="en" 
         localized_value="Curabitur vel sapien eu eros gravida bibendum vitae." />
     
+    <ccm_cms.assets object_id="-11100" />
+    <ccm_cms.assets object_id="-11200" />
+    <ccm_cms.assets object_id="-11300" />
+    
+    <ccm_cms.assets_aud object_id="-11100" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-11200" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-11100" 
+                        rev="10" />
+    <ccm_cms.assets_aud object_id="-11300" 
+                        rev="10" />
+    
+    <ccm_cms.binary_assets object_id="-11100"
+                           filename="sharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    <ccm_cms.binary_assets object_id="-11200"
+                           filename="nonSharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    <ccm_cms.binary_assets object_id="-11300"
+                           filename="nonSharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-11100"
+                               rev="10"
+                               filename="sharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-11300"
+                               rev="10"
+                               filename="nonSharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    
+    <ccm_cms.binary_assets_aud object_id="-11100"
+                               rev="0"
+                               filename="sharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-11200"
+                               rev="0"
+                               filename="nonSharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    
+    <ccm_cms.files object_id="-11100" />
+    <ccm_cms.files object_id="-11200" />
+    <ccm_cms.files object_id="-11300" />
+    
+    <ccm_cms.files_aud object_id="-11100"
+                       rev="0" />
+    <ccm_cms.files_aud object_id="-11200"
+                       rev="0" />
+    <ccm_cms.files_aud object_id="-11100"
+                       rev="10" />
+    <ccm_cms.files_aud object_id="-11300"
+                       rev="10" />
+    
     <ccm_core.categorizations categorization_id="-30100" 
                               category_id="-2110" 
                               object_id="-10100" 
@@ -591,6 +678,89 @@
                               object_order="1" 
                               category_index="false"
                               type="folder" />
+    <ccm_core.categorizations categorization_id="-98300" 
+                              category_id="-2200" 
+                              object_id="-11100" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false" 
+                              type="folder" />
+    
+    <ccm_cms.attachment_lists list_id="-510010"
+                              name="list1"
+                              list_order="1"
+                              uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                              item_id="-10100" />
+    <ccm_cms.attachment_lists list_id="-510020"
+                              name="list1"
+                              list_order="1"
+                              uuid="00000000-0000-0000-0000-000000000000"
+                              item_id="-99100" />
+    
+    <ccm_cms.attachment_lists_aud list_id="-510010"
+                                  rev="0"
+                                  revtype="0"
+                                  name="list1"
+                                  list_order="1"
+                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                                  item_id="-10100" />
+    <ccm_cms.attachment_lists_aud list_id="-510020"
+                                  rev="10"
+                                  revtype="0"
+                                  name="list1"
+                                  list_order="1"
+                                  uuid="00000000-0000-0000-0000-000000000000"
+                                  item_id="-99100" />
+    
+    <ccm_cms.attachments attachment_id="-510110"
+                         sort_key="1"
+                         uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
+                         asset_id="-11100"
+                         attachment_list_id="-510010" />
+    <ccm_cms.attachments attachment_id="-510120"
+                         sort_key="1"
+                         uuid="bfea9877-3300-4000-be99-94258f3e832f"
+                         asset_id="-11200"
+                         attachment_list_id="-510010" />
+    <ccm_cms.attachments attachment_id="-510130"
+                         sort_key="1"
+                         uuid="00000000-0000-0000-0000-000000000000"
+                         asset_id="-11100"
+                         attachment_list_id="-510020" />
+    <ccm_cms.attachments attachment_id="-510140"
+                         sort_key="1"
+                         uuid="00000000-0000-0000-0000-000000000000"
+                         asset_id="-11300"
+                         attachment_list_id="-510020" />
+    
+    <ccm_cms.attachments_aud attachment_id="-510110"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
+                             asset_id="-11100"
+                             attachment_list_id="-510010" />
+    <ccm_cms.attachments_aud attachment_id="-510120"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="bfea9877-3300-4000-be99-94258f3e832f"
+                             asset_id="-11200"
+                             attachment_list_id="-510010" />
+    <ccm_cms.attachments_aud attachment_id="-510130"
+                             rev="10"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="00000000-0000-0000-0000-000000000000"
+                             asset_id="-11100"
+                             attachment_list_id="-510020" />
+    <ccm_cms.attachments_aud attachment_id="-510140"
+                             rev="10"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="00000000-0000-0000-0000-000000000000"
+                             asset_id="-11300"
+                             attachment_list_id="-510020" />
     
     <ccm_core.ccm_roles role_id="-3100"
                         name="info_alert_recipient" />

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

@@ -140,6 +140,12 @@
     <ccm_core.ccm_objects object_id="-2400"
                           display_name="projects_assets"
                           uuid="8c4e9717-7cae-4f7d-bb25-f3aff793755e" />
+    <ccm_core.ccm_objects object_id="-11100"
+                          display_name="sharedAsset"
+                          uuid="419a03e2-0415-4090-952d-cdc58e5e302c" />
+    <ccm_core.ccm_objects object_id="-11200"
+                          display_name="nonSharedAsset"
+                          uuid="23b0ed3c-e0ea-4a74-817c-eff2b8eeb15f" />
     <ccm_core.ccm_objects object_id="-20300"
                           display_name="org.librecms.contenttypes.Article"
                           uuid="bd061ab6-9c4f-45ff-ab69-f521008eeac3" />
@@ -151,12 +157,12 @@
     <ccm_core.ccm_objects_aud object_id="-10200" 
                               rev="0"
                               revtype="0"
-                              revend="1"
+                              revend="6"
                               display_name="article2" />
     <ccm_core.ccm_objects_aud object_id="-99200" 
                               rev="0"
                               revtype="0"
-                              revend="1"
+                              revend="6"
                               display_name="article2" />
     <ccm_core.ccm_objects_aud object_id="-10300" 
                               rev="0"
@@ -167,13 +173,24 @@
                               revtype="0"
                               display_name="news1" />
     <ccm_core.ccm_objects_aud object_id="-10200" 
-                              rev="1"
+                              rev="6"
                               revtype="1"
                               display_name="article2" />
+    <ccm_core.ccm_objects_aud object_id="-99300"
+                              rev="6"
+                              revtype="0" 
+                              display_name="article2" />
     <ccm_core.ccm_objects_aud object_id="-99200" 
-                              rev="1"
+                              rev="6"
-                              revtype="1"
+                              revtype="2" />
-                              display_name="article2" />
+    <ccm_core.ccm_objects_aud object_id="-11100"
+                              rev="0"
+                              revtype="0"
+                              display_name="sharedAsset" />
+    <ccm_core.ccm_objects_aud object_id="-11200"
+                              rev="0"
+                              revtype="0"
+                              display_name="nonSharedAsset" />
     
     <ccm_core.categories object_id="-2100"
                          unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
@@ -370,13 +387,15 @@
                                version="DRAFT" 
                                content_type_id="-20200"/>
     <ccm_cms.content_items_aud object_id="-10200" 
-                               rev="1"
+                               rev="6"
                                item_uuid="acae860f-2ffa-450d-b486-054292f0dae6" 
                                version="DRAFT" 
                                content_type_id="-20100"/>
     <ccm_cms.content_items_aud object_id="-99200" 
-                               rev="1"
+                               rev="6" />
-                               item_uuid="acae860f-2ffa-450d-b486-054292f0dae6" 
+    <ccm_cms.content_items_aud object_id="-99300" 
+                               rev="6"
+                               item_uuid="00000000-0000-0000-0000-000000000000" 
                                version="LIVE" 
                                content_type_id="-20100"/>
         
@@ -405,7 +424,7 @@
                                     object_id="-10200"
                                     localized_value="article2"
                                     locale="en"
-                                    revend="1"
+                                    revend="6"
                                     revtype="0" />
     <ccm_cms.content_item_names_aud rev="0" 
                                     object_id="-10300"
@@ -422,23 +441,23 @@
                                     localized_value="article2"
                                     locale="en"
                                     revtype="0" 
-                                    revend="1"/>
+                                    revend="6"/>
-    <ccm_cms.content_item_names_aud rev="1"
+    <ccm_cms.content_item_names_aud rev="6"
                                     object_id="-10200" 
                                     localized_value="article2-edited"
                                     locale="en"
                                     revtype="0" />
-    <ccm_cms.content_item_names_aud rev="1"
+    <ccm_cms.content_item_names_aud rev="6"
                                     object_id="-10200" 
                                     localized_value="article2"
                                     locale="en"
                                     revtype="2" />
-    <ccm_cms.content_item_names_aud rev="1"
+    <ccm_cms.content_item_names_aud rev="6"
-                                    object_id="-99200" 
+                                    object_id="-99300" 
                                     localized_value="article2-edited"
                                     locale="en"
                                     revtype="0" />
-    <ccm_cms.content_item_names_aud rev="1"
+    <ccm_cms.content_item_names_aud rev="6"
                                     object_id="-99200" 
                                     localized_value="article2"
                                     locale="en"
@@ -485,22 +504,22 @@
                                      localized_value="Article 2 Title"
                                      locale="en"
                                      revtype="0" />
-    <ccm_cms.content_item_titles_aud rev="1"
+    <ccm_cms.content_item_titles_aud rev="6"
                                      object_id="-10200" 
                                      localized_value="Article has been edited"
                                      locale="en"
                                      revtype="0" />
-    <ccm_cms.content_item_titles_aud rev="1"
+    <ccm_cms.content_item_titles_aud rev="6"
                                      object_id="-10200" 
                                      localized_value="Article 2"
                                      locale="en"
                                      revtype="2" />
-    <ccm_cms.content_item_titles_aud rev="1"
+    <ccm_cms.content_item_titles_aud rev="6"
-                                     object_id="-99200" 
+                                     object_id="-99300" 
                                      localized_value="Article has been edited"
                                      locale="en"
                                      revtype="0" />
-    <ccm_cms.content_item_titles_aud rev="1"
+    <ccm_cms.content_item_titles_aud rev="6"
                                      object_id="-99200" 
                                      localized_value="Article 2 Title"
                                      locale="en"
@@ -549,16 +568,29 @@
         revtype="0" />
     <ccm_cms.article_texts_aud 
         rev="0" 
+        revend="6"
         object_id="-99200" 
         localized_value="Duis quis tincidunt elit. In pharetra justo sit amet ipsum dictum, at." 
         locale="en" 
         revtype="0" />
+    <ccm_cms.article_texts_aud 
+        rev="6" 
+        object_id="-99200" 
+        localized_value="Duis quis tincidunt elit. In pharetra justo sit amet ipsum dictum, at." 
+        locale="en" 
+        revtype="2" />
     <ccm_cms.article_texts_aud 
         rev="0" 
         object_id="-10300" 
         localized_value="Etiam euismod lacus laoreet sodales ultricies. Pellentesque non elit vitae purus sagittis." 
         locale="en" 
         revtype="0" />
+    <ccm_cms.article_texts_aud 
+        rev="6" 
+        object_id="-99300" 
+        localized_value="Duis quis tincidunt elit. In pharetra justo sit amet ipsum dictum, at." 
+        locale="en" 
+        revtype="0" />
 
     <ccm_cms.news object_id="-10400"
                   news_date="2016-08-08" 
@@ -569,6 +601,34 @@
         locale="en" 
         localized_value="Curabitur vel sapien eu eros gravida bibendum vitae." />
     
+    <ccm_cms.assets object_id="-11100" />
+    <ccm_cms.assets object_id="-11200" />
+    
+    <ccm_cms.assets_aud object_id="-11100" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-11200" 
+                        rev="0" />
+    
+    <ccm_cms.binary_assets object_id="-11100"
+                           filename="sharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    <ccm_cms.binary_assets object_id="-11200"
+                           filename="nonSharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    
+    <ccm_cms.binary_assets_aud object_id="-11100"
+                               rev="0"
+                               filename="sharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-11200"
+                               rev="0"
+                               filename="nonSharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    
     <ccm_core.categorizations categorization_id="-30100" 
                               category_id="-2110" 
                               object_id="-10100" 
@@ -605,6 +665,54 @@
                               category_index="false" 
                               type="folder" />
     
+    <ccm_core.categorizations categorization_id="-98300" 
+                              category_id="-2200" 
+                              object_id="-11100" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false" 
+                              type="folder" />
+    
+    <ccm_cms.attachment_lists list_id="-510010"
+                              name="list1"
+                              list_order="1"
+                              uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                              item_id="-10100" />
+    
+    <ccm_cms.attachment_lists_aud list_id="-510010"
+                                  rev="0"
+                                  revtype="0"
+                                  name="list1"
+                                  list_order="1"
+                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                                  item_id="-10100" />
+    
+    <ccm_cms.attachments attachment_id="-510110"
+                         sort_key="1"
+                         uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
+                         asset_id="-11100"
+                         attachment_list_id="-510010" />
+    <ccm_cms.attachments attachment_id="-510120"
+                         sort_key="1"
+                         uuid="bfea9877-3300-4000-be99-94258f3e832f"
+                         asset_id="-11200"
+                         attachment_list_id="-510010" />
+    
+    <ccm_cms.attachments_aud attachment_id="-510110"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
+                             asset_id="-11100"
+                             attachment_list_id="-510010" />
+    <ccm_cms.attachments_aud attachment_id="-510120"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="bfea9877-3300-4000-be99-94258f3e832f"
+                             asset_id="-11200"
+                             attachment_list_id="-510010" />
+    
     <ccm_core.ccm_roles role_id="-3100"
                         name="info_alert_recipient" />
     <ccm_core.ccm_roles role_id="-3200"

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

@@ -136,6 +136,12 @@
     <ccm_core.ccm_objects object_id="-2400"
                           display_name="projects_assets"
                           uuid="8c4e9717-7cae-4f7d-bb25-f3aff793755e" />
+    <ccm_core.ccm_objects object_id="-11100"
+                          display_name="sharedAsset"
+                          uuid="419a03e2-0415-4090-952d-cdc58e5e302c" />
+    <ccm_core.ccm_objects object_id="-11200"
+                          display_name="nonSharedAsset"
+                          uuid="23b0ed3c-e0ea-4a74-817c-eff2b8eeb15f" />
     <ccm_core.ccm_objects object_id="-20300"
                           display_name="org.librecms.contenttypes.Article"
                           uuid="bd061ab6-9c4f-45ff-ab69-f521008eeac3" />
@@ -163,6 +169,14 @@
     <ccm_core.ccm_objects_aud object_id="-99200" 
                               rev="1"
                               revtype="2" />
+    <ccm_core.ccm_objects_aud object_id="-11100"
+                                  rev="0"
+                                  revtype="0"
+                                  display_name="sharedAsset" />
+    <ccm_core.ccm_objects_aud object_id="-11200"
+                              rev="0"
+                              revtype="0"
+                              display_name="nonSharedAsset" />
     
     <ccm_core.categories object_id="-2100"
                          unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
@@ -510,6 +524,42 @@
         locale="en" 
         localized_value="Curabitur vel sapien eu eros gravida bibendum vitae." />
     
+        <ccm_cms.assets object_id="-11100" />
+    <ccm_cms.assets object_id="-11200" />
+    
+    <ccm_cms.assets_aud object_id="-11100" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-11200" 
+                        rev="0" />
+    
+    <ccm_cms.binary_assets object_id="-11100"
+                           filename="sharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    <ccm_cms.binary_assets object_id="-11200"
+                           filename="nonSharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    
+    <ccm_cms.binary_assets_aud object_id="-11100"
+                               rev="0"
+                               filename="sharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-11200"
+                               rev="0"
+                               filename="nonSharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    
+    <ccm_cms.files object_id="-11100" />
+    <ccm_cms.files object_id="-11200" />
+    
+    <ccm_cms.files_aud object_id="-11100"
+                       rev="0" />
+    <ccm_cms.files_aud object_id="-11200"
+                       rev="0" />
+    
     <ccm_core.categorizations categorization_id="-30100" 
                               category_id="-2110" 
                               object_id="-10100" 
@@ -539,6 +589,54 @@
                               category_index="false" 
                               type="folder" />
     
+    <ccm_core.categorizations categorization_id="-98300" 
+                              category_id="-2200" 
+                              object_id="-11100" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false" 
+                              type="folder" />
+    
+    <ccm_cms.attachment_lists list_id="-510010"
+                              name="list1"
+                              list_order="1"
+                              uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                              item_id="-10100" />
+    
+    <ccm_cms.attachment_lists_aud list_id="-510010"
+                                  rev="0"
+                                  revtype="0"
+                                  name="list1"
+                                  list_order="1"
+                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                                  item_id="-10100" />
+    
+    <ccm_cms.attachments attachment_id="-510110"
+                         sort_key="1"
+                         uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
+                         asset_id="-11100"
+                         attachment_list_id="-510010" />
+    <ccm_cms.attachments attachment_id="-510120"
+                         sort_key="1"
+                         uuid="bfea9877-3300-4000-be99-94258f3e832f"
+                         asset_id="-11200"
+                         attachment_list_id="-510010" />
+    
+    <ccm_cms.attachments_aud attachment_id="-510110"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
+                             asset_id="-11100"
+                             attachment_list_id="-510010" />
+    <ccm_cms.attachments_aud attachment_id="-510120"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="bfea9877-3300-4000-be99-94258f3e832f"
+                             asset_id="-11200"
+                             attachment_list_id="-510010" />
+    
     <ccm_core.ccm_roles role_id="-3100"
                         name="info_alert_recipient" />
     <ccm_core.ccm_roles role_id="-3200"

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

@@ -137,6 +137,12 @@
     <ccm_core.ccm_objects object_id="-2400"
                           display_name="projects_assets"
                           uuid="8c4e9717-7cae-4f7d-bb25-f3aff793755e" />
+    <ccm_core.ccm_objects object_id="-11100"
+                          display_name="sharedAsset"
+                          uuid="419a03e2-0415-4090-952d-cdc58e5e302c" />
+    <ccm_core.ccm_objects object_id="-11200"
+                          display_name="nonSharedAsset"
+                          uuid="23b0ed3c-e0ea-4a74-817c-eff2b8eeb15f" />
     <ccm_core.ccm_objects object_id="-20300"
                           display_name="org.librecms.contenttypes.Article"
                           uuid="bd061ab6-9c4f-45ff-ab69-f521008eeac3" />
@@ -161,6 +167,14 @@
                               rev="0"
                               revtype="0"
                               display_name="news1" />
+    <ccm_core.ccm_objects_aud object_id="-11100"
+                              rev="0"
+                              revtype="0"
+                              display_name="sharedAsset" />
+    <ccm_core.ccm_objects_aud object_id="-11200"
+                              rev="0"
+                              revtype="0"
+                              display_name="nonSharedAsset" />
     
     <ccm_core.categories object_id="-2100"
                          unique_id="82014239-9c06-486d-ae8c-4ae47f52a699"
@@ -504,6 +518,42 @@
         locale="en" 
         localized_value="Curabitur vel sapien eu eros gravida bibendum vitae." />
     
+    <ccm_cms.assets object_id="-11100" />
+    <ccm_cms.assets object_id="-11200" />
+    
+    <ccm_cms.assets_aud object_id="-11100" 
+                        rev="0" />
+    <ccm_cms.assets_aud object_id="-11200" 
+                        rev="0" />
+    
+    <ccm_cms.binary_assets object_id="-11100"
+                           filename="sharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    <ccm_cms.binary_assets object_id="-11200"
+                           filename="nonSharedAsset.pdf"
+                           mime_type="application/pdf"
+                           data_size="0" />
+    
+    <ccm_cms.binary_assets_aud object_id="-11100"
+                               rev="0"
+                               filename="sharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-11200"
+                               rev="0"
+                               filename="nonSharedAsset.pdf"
+                               mime_type="application/pdf"
+                               data_size="0" />
+    
+    <ccm_cms.files object_id="-11100" />
+    <ccm_cms.files object_id="-11200" />
+    
+    <ccm_cms.files_aud object_id="-11100"
+                       rev="0" />
+    <ccm_cms.files_aud object_id="-11200"
+                       rev="0" />
+    
     <ccm_core.categorizations categorization_id="-30100" 
                               category_id="-2110" 
                               object_id="-10100" 
@@ -539,6 +589,53 @@
                               object_order="2" 
                               category_index="false" 
                               type="folder" />
+    <ccm_core.categorizations categorization_id="-98300" 
+                              category_id="-2200" 
+                              object_id="-11100" 
+                              category_order="1" 
+                              object_order="2" 
+                              category_index="false" 
+                              type="folder" />
+    
+    <ccm_cms.attachment_lists list_id="-510010"
+                              name="list1"
+                              list_order="1"
+                              uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                              item_id="-10100" />
+    
+    <ccm_cms.attachment_lists_aud list_id="-510010"
+                                  rev="0"
+                                  revtype="0"
+                                  name="list1"
+                                  list_order="1"
+                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                                  item_id="-10100" />
+    
+    <ccm_cms.attachments attachment_id="-510110"
+                         sort_key="1"
+                         uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
+                         asset_id="-11100"
+                         attachment_list_id="-510010" />
+    <ccm_cms.attachments attachment_id="-510120"
+                         sort_key="1"
+                         uuid="bfea9877-3300-4000-be99-94258f3e832f"
+                         asset_id="-11200"
+                         attachment_list_id="-510010" />
+    
+    <ccm_cms.attachments_aud attachment_id="-510110"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
+                             asset_id="-11100"
+                             attachment_list_id="-510010" />
+    <ccm_cms.attachments_aud attachment_id="-510120"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="bfea9877-3300-4000-be99-94258f3e832f"
+                             asset_id="-11200"
+                             attachment_list_id="-510010" />
     
     <ccm_core.ccm_roles role_id="-3100"
                         name="info_alert_recipient" />