CCM NG/ccm-cms:

- Repositories, Managers and base classes for Assets and Attachments moved to org.librecms.contentsection package to allow access to protected methods of ContentItem
- AttachmentListManager finished


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

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

@@ -18,6 +18,8 @@
  */
 package org.librecms.assets;
 
+import org.librecms.contentsection.Asset;
+
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Objects;

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

@@ -18,9 +18,12 @@
  */
 package org.librecms.assets;
 
+import org.librecms.contentsection.Asset;
+
 import java.io.Serializable;
 import java.net.URL;
 import java.util.Objects;
+
 import javax.persistence.AssociationOverride;
 import javax.persistence.Column;
 import javax.persistence.Embedded;
@@ -28,6 +31,7 @@ import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.Table;
+
 import org.hibernate.envers.Audited;
 import org.hibernate.validator.constraints.NotEmpty;
 import org.libreccm.l10n.LocalizedString;

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

@@ -18,6 +18,7 @@
  */
 package org.librecms.assets;
 
+import org.librecms.contentsection.Asset;
 import org.hibernate.envers.Audited;
 import org.libreccm.l10n.LocalizedString;
 

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

@@ -18,6 +18,7 @@
  */
 package org.librecms.assets;
 
+import org.librecms.contentsection.Asset;
 import org.hibernate.envers.Audited;
 import org.librecms.contentsection.ContentItem;
 

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

@@ -18,6 +18,7 @@
  */
 package org.librecms.assets;
 
+import org.librecms.contentsection.Asset;
 import org.hibernate.envers.Audited;
 import org.libreccm.l10n.LocalizedString;
 

ccm-cms/src/main/java/org/librecms/attachments/AttachmentListManager.java

@@ -1,219 +0,0 @@
-/*
- * Copyright (C) 2016 LibreCCM Foundation.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301  USA
- */
-package org.librecms.attachments;
-
-import org.libreccm.security.PermissionChecker;
-import org.librecms.contentsection.ContentItem;
-import org.librecms.contentsection.ContentItemManager;
-import org.librecms.contentsection.privileges.ItemPrivileges;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-import javax.transaction.Transactional;
-
-/**
- * Provides methods for managing the {@link AttachmentList}s of an
- * {@link ContentItem}.
- *
- * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
- */
-@RequestScoped
-public class AttachmentListManager {
-
-    @Inject
-    private ContentItemManager itemManager;
-
-    @Inject
-    private PermissionChecker permissionChecker;
-
-    @Inject
-    private EntityManager entityManager;
-
-    /**
-     * Retrieves the names of all {@link AttachmentList}s of an
-     * {@link ContentItem}.
-     *
-     * @param item The item from the which the names are retrieved.
-     *
-     * @return A list containing the names all the attachment lists of the item,
-     *         in the order of the attachment lists.
-     */
-    @Transactional(Transactional.TxType.REQUIRED)
-    public List<String> getAttachmentListNames(final ContentItem item) {
-        if (item == null) {
-            throw new IllegalArgumentException(
-                "Can't get AttachmentList(s) from null.");
-        }
-
-        //We have to distinguish between live and draft versions, therefore
-        //we can't use the CDI interceptor here.
-        if (itemManager.isLive(item)) {
-            permissionChecker.checkPermission(ItemPrivileges.VIEW_PUBLISHED,
-                                              item);
-        } else {
-            permissionChecker.checkPermission(ItemPrivileges.PREVIEW, item);
-        }
-
-        final List<AttachmentList> lists = item.getAttachments();
-        final List<String> names = lists.stream()
-            .map(list -> list.getName())
-            .collect(Collectors.toList());
-
-        Collections.sort(names);
-
-        return names;
-    }
-
-    /**
-     * Retrieves all {@link AttachmentList}s of a {@link ContentItem} with a
-     * specific name.
-     *
-     * @param item The item from which the lists are retrieved.
-     * @param name The name of the lists to retrieve.
-     *
-     * @return A list of the attachment lists with the specified name. If no
-     *         attachment list of the {@code item} does match the provided
-     *         {@code name} an empty list is returned.
-     */
-    public List<AttachmentList> getAttachmentList(
-        final ContentItem item,
-        final String name) {
-
-        if (item == null) {
-            throw new IllegalArgumentException(
-                "Can't get attachments lists from null.");
-        }
-
-        if (name == null || name.trim().isEmpty()) {
-            throw new IllegalArgumentException(
-                "An AttachmentList can't have an empty name.");
-        }
-
-        //We have to distinguish between live and draft versions, therefore
-        //we can't use the CDI interceptor here.
-        if (itemManager.isLive(item)) {
-            permissionChecker.checkPermission(ItemPrivileges.VIEW_PUBLISHED,
-                                              item);
-        } else {
-            permissionChecker.checkPermission(ItemPrivileges.PREVIEW, item);
-        }
-
-        final TypedQuery<AttachmentList> query = entityManager.createNamedQuery(
-            "AttachmentList.findForItemAndName", AttachmentList.class);
-        query.setParameter("name", name);
-        query.setParameter("item", item);
-
-        return query.getResultList();
-    }
-
-    /**
-     * Adds a new {@link AttachmentList} to an {@link ContentItem}. The list is
-     * put after the existing attachment lists.
-     *
-     * @param item The item to which the list is added.
-     * @param name The name of the new attachment list.
-     *
-     * @return The new attachment list.
-     */
-    public AttachmentList createAttachmentList(final ContentItem item,
-                                               final String name) {
-
-        final List<AttachmentList> lists = item.getAttachments();
-        Collections.sort(lists,
-                         (list1, list2) -> Long.compare(list1.getOrder(),
-                                                        list2.getOrder()));
-        
-        final long lastOrder = lists.get(lists.size() - 1).getOrder();
-        
-        final AttachmentList newList = new AttachmentList();
-        newList.setItem(item);
-        newList.setName(name);
-        newList.setOrder(lastOrder + 1);
-
-//        item.addAttachmentList(newList);
-    }
-
-    /**
-     * Adds a new {@link AttachmentList} an {@link ContentItem}. The list is put
-     * after the specified position.
-     *
-     * @param item  The item to which the list is added.
-     * @param name  The name of the new attachment list.
-     * @param after The position after which the new attachment list is added.
-     *              If the provided value is larger than the number of existing
-     *              attachment lists the list is added after the last one.
-     *
-     * @return The new attachment list.
-     */
-    public AttachmentList createAttachmentList(final ContentItem item,
-                                               final String name,
-                                               final long after) {
-        throw new UnsupportedOperationException("Not implemented yet");
-    }
-
-    /**
-     * Removes an {@link AttachentList} from the owning item. All non shared
-     * assets assigned to the {@code attachmentList} are deleted.
-     *
-     * @param attachmentList The attachment list to remove.
-     */
-    public void removeAttachmentList(final AttachmentList attachmentList) {
-        throw new UnsupportedOperationException("Not implemented yet");
-    }
-
-    /**
-     * Moves an attachment list one position up.
-     *
-     * @param attachmentList The list to move.
-     */
-    public void moveUp(final AttachmentList attachmentList) {
-        throw new UnsupportedOperationException("Not implemented yet");
-    }
-
-    /**
-     * Moves an attachment list one position down.
-     *
-     * @param attachmentList The list to move.
-     */
-    public void moveDown(final AttachmentList attachmentList) {
-        throw new UnsupportedOperationException("Not implemented yet");
-    }
-
-    /**
-     * Moves an attachment list to a specific position. The attachment list with
-     * the provided index is moved one position down. If the position is larger
-     * than the number of attachment lists the list is moved to the last
-     * position.
-     *
-     * @param attachmentList The list to move.
-     * @param position       The position to which the list is moved.
-     */
-    public void moveTo(final AttachmentList attachmentList,
-                       final long position) {
-        throw new UnsupportedOperationException("Not implemented yet");
-    }
-
-}

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

@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.librecms.assets;
+package org.librecms.contentsection;
 
 import org.hibernate.envers.Audited;
 import org.libreccm.categorization.Categorization;
@@ -24,7 +24,6 @@ import org.libreccm.core.CcmObject;
 import org.libreccm.l10n.LocalizedString;
 import org.libreccm.security.InheritsPermissions;
 import org.librecms.CmsConstants;
-import org.librecms.attachments.ItemAttachment;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -155,6 +154,7 @@ public class Asset extends CcmObject implements InheritsPermissions {
 
     public Asset() {
         title = new LocalizedString();
+        itemAttachments = new ArrayList<>();
     }
 
     public LocalizedString getTitle() {
@@ -173,6 +173,24 @@ public class Asset extends CcmObject implements InheritsPermissions {
         }
     }
 
+    protected void setItemAttachments(
+        final List<ItemAttachment<?>> itemAttachments) {
+
+        if (itemAttachments == null) {
+            this.itemAttachments = new ArrayList<>();
+        } else {
+            this.itemAttachments = itemAttachments;
+        }
+    }
+
+    protected void addItemAttachment(final ItemAttachment<?> itemAttachment) {
+        itemAttachments.add(itemAttachment);
+    }
+
+    protected void removeItemAttachment(final ItemAttachment<?> itemAttachment) {
+        itemAttachments.remove(itemAttachment);
+    }
+
     @Override
     public Optional<CcmObject> getParent() {
         // For sharable assets the parent is the folder in the asset is stored

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

@@ -17,7 +17,7 @@
  * MA 02110-1301  USA
  */
 
-package org.librecms.assets;
+package org.librecms.contentsection;
 
 /**
  *

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

@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.librecms.assets;
+package org.librecms.contentsection;
 
 import com.arsdigita.util.UncheckedWrapperException;
 
@@ -40,18 +40,12 @@ import org.libreccm.core.CoreConstants;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
 import org.librecms.CmsConstants;
-import org.librecms.attachments.AttachmentList;
-import org.librecms.contentsection.ContentSection;
-import org.librecms.contentsection.Folder;
-import org.librecms.contentsection.FolderManager;
-import org.librecms.contentsection.FolderRepository;
 import org.librecms.contentsection.privileges.AssetPrivileges;
 
 import java.util.Objects;
 
 import org.libreccm.categorization.ObjectNotAssignedToCategoryException;
 import org.libreccm.l10n.LocalizedString;
-import org.librecms.contentsection.FolderType;
 
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;

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

@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.librecms.assets;
+package org.librecms.contentsection;
 
 import com.arsdigita.util.UncheckedWrapperException;
 
@@ -27,8 +27,6 @@ import org.libreccm.categorization.ObjectNotAssignedToCategoryException;
 import org.libreccm.core.CcmObjectRepository;
 import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
-import org.librecms.CmsConstants;
-import org.librecms.contentsection.Folder;
 import org.librecms.contentsection.privileges.AssetPrivileges;
 
 import java.util.List;

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

@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.librecms.attachments;
+package org.librecms.contentsection;
 
 import org.hibernate.envers.Audited;
 import org.libreccm.core.Identifiable;
@@ -157,7 +157,7 @@ public class AttachmentList implements Comparable<AttachmentList>,
         return item;
     }
 
-    public void setItem(final ContentItem item) {
+    protected void setItem(final ContentItem item) {
         this.item = item;
     }
 

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

@@ -0,0 +1,386 @@
+/*
+ * Copyright (C) 2016 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.librecms.contentsection;
+
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.PermissionChecker;
+import org.libreccm.security.RequiresPrivilege;
+import org.librecms.contentsection.privileges.ItemPrivileges;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.persistence.TypedQuery;
+import javax.transaction.Transactional;
+
+/**
+ * Provides methods for managing the {@link AttachmentList}s of an
+ * {@link ContentItem}.
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+public class AttachmentListManager {
+
+    @Inject
+    private ContentItemRepository itemRepo;
+
+    @Inject
+    private ContentItemManager itemManager;
+
+    @Inject
+    private AssetManager assetManager;
+
+    @Inject
+    private PermissionChecker permissionChecker;
+
+    @Inject
+    private EntityManager entityManager;
+
+    /**
+     * Helper method to normalise the order columns for an list of
+     * {@link AttachmentList}s. After this method has been applied the values of
+     * the order attribute/column are the same as the position index in the
+     * list.
+     *
+     * @param lists The list of attachment lists to normalise.
+     */
+    private void normalizeOrder(final List<AttachmentList> lists) {
+        for (int i = 0; i < lists.size(); i++) {
+            lists.get(i).setOrder(i);
+            entityManager.merge(lists.get(i));
+        }
+    }
+
+    /**
+     * Retrieves the names of all {@link AttachmentList}s of an
+     * {@link ContentItem}.
+     *
+     * @param item The item from the which the names are retrieved.
+     *
+     * @return A list containing the names all the attachment lists of the item,
+     *         in the order of the attachment lists.
+     */
+    @Transactional(Transactional.TxType.REQUIRED)
+    public List<String> getAttachmentListNames(final ContentItem item) {
+        if (item == null) {
+            throw new IllegalArgumentException(
+                "Can't get AttachmentList(s) from null.");
+        }
+
+        //We have to distinguish between live and draft versions, therefore
+        //we can't use the CDI interceptor here.
+        if (itemManager.isLive(item)) {
+            permissionChecker.checkPermission(ItemPrivileges.VIEW_PUBLISHED,
+                                              item);
+        } else {
+            permissionChecker.checkPermission(ItemPrivileges.PREVIEW, item);
+        }
+
+        final List<AttachmentList> lists = item.getAttachments();
+        final List<String> names = lists.stream()
+            .map(list -> list.getName())
+            .collect(Collectors.toList());
+
+        Collections.sort(names);
+
+        return names;
+    }
+
+    /**
+     * Retrieves all {@link AttachmentList}s of a {@link ContentItem} with a
+     * specific name.
+     *
+     * @param item The item from which the lists are retrieved.
+     * @param name The name of the lists to retrieve.
+     *
+     * @return A list of the attachment lists with the specified name. If no
+     *         attachment list of the {@code item} does match the provided
+     *         {@code name} an empty list is returned.
+     */
+    @Transactional(Transactional.TxType.REQUIRED)
+    public List<AttachmentList> getAttachmentList(
+        final ContentItem item,
+        final String name) {
+
+        if (item == null) {
+            throw new IllegalArgumentException(
+                "Can't get attachments lists from null.");
+        }
+
+        if (name == null || name.trim().isEmpty()) {
+            throw new IllegalArgumentException(
+                "An AttachmentList can't have an empty name.");
+        }
+
+        //We have to distinguish between live and draft versions, therefore
+        //we can't use the CDI interceptor here.
+        if (itemManager.isLive(item)) {
+            permissionChecker.checkPermission(ItemPrivileges.VIEW_PUBLISHED,
+                                              item);
+        } else {
+            permissionChecker.checkPermission(ItemPrivileges.PREVIEW, item);
+        }
+
+        final TypedQuery<AttachmentList> query = entityManager.createNamedQuery(
+            "AttachmentList.findForItemAndName", AttachmentList.class);
+        query.setParameter("name", name);
+        query.setParameter("item", item);
+
+        return query.getResultList();
+    }
+
+    /**
+     * Adds a new {@link AttachmentList} to an {@link ContentItem}. The list is
+     * put after the existing attachment lists.
+     *
+     * @param item The item to which the list is added.
+     * @param name The name of the new attachment list.
+     *
+     * @return The new attachment list.
+     */
+    @Transactional(Transactional.TxType.REQUIRED)
+    @AuthorizationRequired
+    public AttachmentList createAttachmentList(
+        @RequiresPrivilege(ItemPrivileges.EDIT)
+        final ContentItem item,
+        final String name) {
+
+        if (item == null) {
+            throw new IllegalArgumentException(
+                "Can't add an attachment list to null.");
+        }
+
+        if (name == null || name.trim().isEmpty()) {
+            throw new IllegalArgumentException(
+                "The name of an attachment list can't be null or empty.");
+        }
+
+        final ContentItem draft = itemManager.getDraftVersion(item,
+                                                              item.getClass());
+
+        final List<AttachmentList> lists = draft.getAttachments();
+        final long lastOrder = lists.get(lists.size() - 1).getOrder();
+
+        final AttachmentList list = new AttachmentList();
+        list.setItem(draft);
+        list.setName(name);
+        list.setUuid(UUID.randomUUID().toString());
+        list.setOrder(lastOrder + 1);
+
+        draft.addAttachmentList(list);
+
+        entityManager.persist(list);
+        itemRepo.save(draft);
+
+        normalizeOrder(lists);
+
+        return list;
+    }
+
+    /**
+     * Adds a new {@link AttachmentList} an {@link ContentItem}. The list is put
+     * after the specified position.
+     *
+     * @param item     The item to which the list is added.
+     * @param name     The name of the new attachment list.
+     * @param position The position at which the new attachment list is added.
+     *                 If the provided value is larger than the number of
+     *                 existing attachment lists the list is added after the
+     *                 last one.
+     *
+     * @return The new attachment list.
+     */
+    @Transactional(Transactional.TxType.REQUIRED)
+    @AuthorizationRequired
+    public AttachmentList createAttachmentList(
+        @RequiresPrivilege(ItemPrivileges.EDIT)
+        final ContentItem item,
+        final String name,
+        final long position) {
+
+        if (item == null) {
+            throw new IllegalArgumentException(
+                "Can't add an attachment list to null.");
+        }
+
+        if (name == null || name.trim().isEmpty()) {
+            throw new IllegalArgumentException(
+                "The name of an attachment list can't be null or empty.");
+        }
+
+        final ContentItem draft = itemManager.getDraftVersion(item,
+                                                              item.getClass());
+
+        final List<AttachmentList> lists = draft.getAttachments();
+        final long listPos;
+        if (position < 0) {
+            listPos = 0;
+        } else if (position >= lists.size()) {
+            return createAttachmentList(draft, name);
+        } else {
+            listPos = position;
+        }
+
+        normalizeOrder(lists);
+
+        final AttachmentList list = new AttachmentList();
+        list.setItem(draft);
+        list.setName(name);
+        list.setUuid(UUID.randomUUID().toString());
+        list.setOrder(listPos);
+
+        for (long i = listPos; i < lists.size(); i++) {
+            lists.get((int) i).setOrder(i + 1);
+            entityManager.merge(lists.get((int) i));
+        }
+
+        draft.addAttachmentList(list);
+
+        entityManager.persist(list);
+        itemRepo.save(draft);
+
+        return list;
+    }
+
+    /**
+     * Removes an {@link AttachentList} from the owning item. All non shared
+     * assets assigned to the {@code attachmentList} are deleted.
+     *
+     * @param attachmentList The attachment list to remove.
+     */
+    @Transactional(Transactional.TxType.REQUIRED)
+    @AuthorizationRequired
+    public void removeAttachmentList(
+        @RequiresPrivilege(ItemPrivileges.EDIT)
+        final AttachmentList attachmentList) {
+
+        if (attachmentList == null) {
+            throw new IllegalArgumentException("Can't delete null.");
+        }
+
+        final ContentItem item = attachmentList.getItem();
+
+        for (ItemAttachment<?> attachment : attachmentList.getAttachments()) {
+            if (!assetManager.isShared(attachment.getAsset())) {
+                entityManager.remove(attachment.getAsset());
+            }
+        }
+
+        for (ItemAttachment<?> attachment : attachmentList.getAttachments()) {
+            entityManager.remove(attachment);
+        }
+
+        entityManager.remove(attachmentList);
+    }
+
+    /**
+     * Moves an attachment list one position up. If the list is already one the
+     * last position does nothing.
+     *
+     * @param attachmentList The list to move.
+     */
+    @Transactional
+    @AuthorizationRequired
+    public void moveUp(
+        @RequiresPrivilege(ItemPrivileges.EDIT)
+        final AttachmentList attachmentList) {
+
+        if (attachmentList == null) {
+            throw new IllegalArgumentException("Can't move null.");
+        }
+
+        final List<AttachmentList> lists = attachmentList.getItem()
+            .getAttachments();
+
+        final Optional<AttachmentList> list1 = lists.stream()
+            .filter(list -> list.getOrder() == attachmentList.getOrder())
+            .findFirst();
+        final Optional<AttachmentList> list2 = lists.stream()
+            .filter(list -> list.getOrder() >= attachmentList.getOrder() + 1)
+            .findFirst();
+
+        if (!list2.isPresent()) {
+            return;
+        }
+
+        final long order1 = list1.get().getOrder();
+        final long order2 = list2.get().getOrder();
+
+        list1.get().setOrder(order2);
+        list2.get().setOrder(order1);
+
+        entityManager.merge(list1.get());
+        entityManager.merge(list2.get());
+    }
+
+    /**
+     * Moves an attachment list one position down.
+     *
+     * @param attachmentList The list to move.
+     */
+    @Transactional(Transactional.TxType.REQUIRED)
+    public void moveDown(
+        @RequiresPrivilege(ItemPrivileges.EDIT)
+        final AttachmentList attachmentList) {
+
+        if (attachmentList == null) {
+            throw new IllegalArgumentException("Can't move null.");
+        }
+
+        final List<AttachmentList> lists = attachmentList.getItem()
+            .getAttachments();
+
+        final Optional<AttachmentList> list1 = lists.stream()
+            .filter(list -> list.getOrder() == attachmentList.getOrder())
+            .findFirst();
+        final List<AttachmentList> lower = lists.stream()
+            .filter(list -> list.getOrder() <= attachmentList.getOrder() - 1)
+            .collect(Collectors.toList());
+        Collections.sort(lower);
+
+        final Optional<AttachmentList> list2;
+        if (lower.isEmpty()) {
+            list2 = Optional.empty();
+        } else {
+            list2 = Optional.of(lower.get(lower.size() - 1));
+        }
+
+        if (!list2.isPresent()) {
+            return;
+        }
+
+        final long order1 = list1.get().getOrder();
+        final long order2 = list2.get().getOrder();
+
+        list1.get().setOrder(order2);
+        list2.get().setOrder(order1);
+
+        entityManager.merge(list1.get());
+        entityManager.merge(list2.get());
+    }
+
+ 
+}

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

@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.librecms.attachments;
+package org.librecms.contentsection;
 
 import org.libreccm.configuration.Configuration;
 import org.libreccm.configuration.Setting;

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

@@ -26,7 +26,6 @@ import org.libreccm.l10n.LocalizedString;
 import org.libreccm.security.InheritsPermissions;
 import org.libreccm.workflow.Workflow;
 import org.librecms.CmsConstants;
-import org.librecms.attachments.AttachmentList;
 import org.librecms.lifecycle.Lifecycle;
 
 import java.io.Serializable;
@@ -67,33 +66,38 @@ import static org.librecms.CmsConstants.*;
 @NamedQueries({
     @NamedQuery(
         name = "ContentItem.findByType",
-        query = "SELECT i FROM ContentItem i WHERE TYPE(i) = :type"),
+        query = "SELECT i FROM ContentItem i WHERE TYPE(i) = :type")
+    ,
     @NamedQuery(
         name = "ContentItem.findByFolder",
         query = "SELECT i FROM ContentItem i "
                     + "JOIN i.categories c "
                     + "WHERE c.category = :folder "
-                    + "AND c.type = '" + CATEGORIZATION_TYPE_FOLDER + "'"),
+                    + "AND c.type = '" + CATEGORIZATION_TYPE_FOLDER + "'")
+    ,
     @NamedQuery(
         name = "ContentItem.countItemsInFolder",
         query = "SELECT count(i) FROM ContentItem i "
                     + "JOIN i.categories c "
                     + "WHERE c.category = :folder "
-                    + "AND c.type = '" + CATEGORIZATION_TYPE_FOLDER + "'"),
+                    + "AND c.type = '" + CATEGORIZATION_TYPE_FOLDER + "'")
+    ,
     @NamedQuery(
         name = "ContentItem.countByNameInFolder",
         query = "SELECT COUNT(i) FROM ContentItem i "
                     + "JOIN i.categories c "
                     + "WHERE c.category = :folder "
                     + "AND c.type = '" + CATEGORIZATION_TYPE_FOLDER + "' "
-                    + "AND i.displayName = :name"),
+                    + "AND i.displayName = :name")
+    ,
     @NamedQuery(
         name = "ContentItem.filterByFolderAndName",
         query = "SELECT i FROM ContentItem i "
                     + "JOIN i.categories c "
                     + "WHERE c.category = :folder "
                     + "AND c.type = '" + CATEGORIZATION_TYPE_FOLDER + "' "
-                    + "AND LOWER(i.displayName) LIKE CONCAT(LOWER(:name), '%')"),
+                    + "AND LOWER(i.displayName) LIKE CONCAT(LOWER(:name), '%')")
+    ,
     @NamedQuery(
         name = "ContentItem.countFilterByFolderAndName",
         query = "SELECT COUNT(i) FROM ContentItem i "
@@ -101,18 +105,21 @@ import static org.librecms.CmsConstants.*;
                     + "WHERE c.category = :folder "
                     + "AND c.type = '" + CATEGORIZATION_TYPE_FOLDER + "' "
                     + "AND LOWER(i.displayName) LIKE CONCAT(LOWER(:name), '%')"
-    ),
+    )
+    ,
     @NamedQuery(
         name = "ContentItem.hasLiveVersion",
         query = "SELECT (CASE WHEN COUNT(i) > 0 THEN true ELSE false END) "
                     + "FROM ContentItem i "
                     + "WHERE i.itemUuid = :uuid "
-                    + "AND i.version = org.librecms.contentsection.ContentItemVersion.LIVE"),
+                    + "AND i.version = org.librecms.contentsection.ContentItemVersion.LIVE")
+    ,
     @NamedQuery(
         name = "ContentItem.findDraftVersion",
         query = "SELECT i FROM ContentItem i "
                     + "WHERE i.itemUuid = :uuid "
-                    + "AND i.version = org.librecms.contentsection.ContentItemVersion.DRAFT"),
+                    + "AND i.version = org.librecms.contentsection.ContentItemVersion.DRAFT")
+    ,
     @NamedQuery(
         name = "ContentItem.findLiveVersion",
         query = "SELECT i FROM ContentItem i "
@@ -296,12 +303,17 @@ public class ContentItem extends CcmObject implements Serializable,
     }
 
     public List<AttachmentList> getAttachments() {
+        Collections.sort(attachments);
         return Collections.unmodifiableList(attachments);
     }
 
     protected void setAttachments(final List<AttachmentList> attachments) {
+        if (attachments == null) {
+            this.attachments = new ArrayList<>();
+        } else {
             this.attachments = attachments;
         }
+    }
 
     protected void addAttachmentList(final AttachmentList attachmentList) {
         attachments.add(attachmentList);

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

@@ -46,7 +46,9 @@ import org.libreccm.security.AuthorizationRequired;
 import org.libreccm.security.RequiresPrivilege;
 import org.libreccm.workflow.Workflow;
 import org.libreccm.workflow.WorkflowManager;
+
 import static org.librecms.CmsConstants.*;
+
 import org.librecms.contentsection.privileges.ItemPrivileges;
 import org.librecms.lifecycle.Lifecycle;
 import org.librecms.lifecycle.LifecycleManager;

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

@@ -16,11 +16,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.librecms.attachments;
+package org.librecms.contentsection;
 
 import org.hibernate.envers.Audited;
 import org.libreccm.core.Identifiable;
-import org.librecms.assets.Asset;
 
 import java.io.Serializable;
 import java.util.Objects;

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

@@ -16,9 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.librecms.attachments;
+package org.librecms.contentsection;
 
-import org.librecms.assets.Asset;
 
 import javax.enterprise.context.RequestScoped;
 

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

@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2016 LibreCCM Foundation.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301  USA
- */
-package org.librecms.assets;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.libreccm.tests.categories.UnitTest;
-import org.libreccm.testutils.DatasetType;
-import org.libreccm.testutils.DatasetsVerifier;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-/**
- * Verify the datasets for the tests in {@code org.librecms.assets}.
- *
- * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
- */
-@RunWith(Parameterized.class)
-@Category(UnitTest.class)
-public class DatasetsTest extends DatasetsVerifier {
-
-    @Parameterized.Parameters(name = "Dataset {0}")
-    public static Collection<String> data() {
-        return Arrays.asList(new String[]{
-            "/datasets/org/librecms/assets/AssetRepositoryTest/data.xml",
-            "/datasets/org/librecms/assets/AssetRepositoryTest/after-delete.xml",
-            
-            "/datasets/org/librecms/assets/AssetManagerTest/data.xml",
-            "/datasets/org/librecms/assets/AssetManagerTest/after-clean-orphaned.xml",
-            "/datasets/org/librecms/assets/AssetManagerTest/after-copy-to-other-contentsection.xml",
-            "/datasets/org/librecms/assets/AssetManagerTest/after-copy-to-other-folder.xml",
-            "/datasets/org/librecms/assets/AssetManagerTest/after-copy-to-same-folder.xml",
-            "/datasets/org/librecms/assets/AssetManagerTest/after-share.xml",
-            "/datasets/org/librecms/assets/AssetManagerTest/after-move-to-other-contentsection.xml",
-            "/datasets/org/librecms/assets/AssetManagerTest/after-move-to-other-folder.xml",
-        });
-    }
-
-    public DatasetsTest(final String datasetPath) {
-        super(datasetPath);
-    }
-
-    @Override
-    public DatasetType getDatasetType() {
-        return DatasetType.FLAT_XML;
-    }
-
-    @Override
-    public String[] getSchemas() {
-        return new String[]{"ccm_core", "ccm_cms"};
-    }
-
-    @Override
-    public String[] getDdlFiles() {
-        return new String[]{"/datasets/create_ccm_cms_schema.sql"};
-    }
-
-    @BeforeClass
-    public static void setUpClass() {
-    }
-
-    @AfterClass
-    public static void tearDownClass() {
-    }
-
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
-
-}

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

@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2016 LibreCCM Foundation.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301  USA
- */
-package org.librecms.attachments;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.libreccm.tests.categories.UnitTest;
-import org.libreccm.testutils.DatasetType;
-import org.libreccm.testutils.DatasetsVerifier;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-/**
- * Verify the datasets for the tests in {@code org.librecms.attachments}.
- *
- * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
- */
-@RunWith(Parameterized.class)
-@Category(UnitTest.class)
-public class DatasetsTest extends DatasetsVerifier {
-
-    @Parameterized.Parameters(name = "Dataset {0}")
-    public static Collection<String> data() {
-        return Arrays.asList(new String[]{
-            "/datasets/org/librecms/attachments/AttachmentListManagerTest/data.xml",
-            "/datasets/org/librecms/attachments/AttachmentListManagerTest/after-create-after-last.xml",
-            "/datasets/org/librecms/attachments/AttachmentListManagerTest/after-create-with-negative-position.xml",
-            "/datasets/org/librecms/attachments/AttachmentListManagerTest/after-create.xml",
-            "/datasets/org/librecms/attachments/AttachmentListManagerTest/after-move-down.xml",
-            "/datasets/org/librecms/attachments/AttachmentListManagerTest/after-move-to-first.xml",
-            "/datasets/org/librecms/attachments/AttachmentListManagerTest/after-move-to-last.xml",
-            "/datasets/org/librecms/attachments/AttachmentListManagerTest/after-move-to.xml",
-            "/datasets/org/librecms/attachments/AttachmentListManagerTest/after-move-up.xml",
-            "/datasets/org/librecms/attachments/AttachmentListManagerTest/after-remove.xml"
-        });
-    }
-
-    public DatasetsTest(final String datasetPath) {
-        super(datasetPath);
-    }
-
-    @Override
-    public DatasetType getDatasetType() {
-        return DatasetType.FLAT_XML;
-    }
-
-    @Override
-    public String[] getSchemas() {
-        return new String[]{"ccm_core", "ccm_cms"};
-    }
-
-    @Override
-    public String[] getDdlFiles() {
-        return new String[]{"/datasets/create_ccm_cms_schema.sql"};
-    }
-
-    @BeforeClass
-    public static void setUpClass() {
-    }
-
-    @AfterClass
-    public static void tearDownClass() {
-    }
-
-    @Before
-    public void setUp() {
-    }
-
-    @After
-    public void tearDown() {
-    }
-
-}

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

@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.librecms.assets;
+package org.librecms.contentsection;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -27,20 +27,20 @@ import org.libreccm.security.Role;
 import org.libreccm.security.User;
 import org.libreccm.tests.categories.UnitTest;
 import org.libreccm.testutils.EqualsVerifier;
-import org.librecms.attachments.ItemAttachment;
-import org.librecms.contentsection.ContentItem;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.UUID;
 
 /**
+ * Verifies that the {@code equals} and {@code hashCode} methods of the {@link Asset}
+ * class are working properly.
  * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RunWith(Parameterized.class)
 @org.junit.experimental.categories.Category(UnitTest.class)
-public class EqualsAndHashCodeTest extends EqualsVerifier {
+public class AssetEqualsAndHashCodeTest extends EqualsVerifier {
 
     @Parameterized.Parameters(name = "{0}")
     public static Collection<Class<?>> data() {
@@ -49,7 +49,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
         });
     }
 
-    public EqualsAndHashCodeTest(final Class<?> clazz) {
+    public AssetEqualsAndHashCodeTest(final Class<?> clazz) {
         super(clazz);
     }
 

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

@@ -16,7 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.librecms.assets;
+package org.librecms.contentsection;
+
 
 import java.util.List;
 import java.util.Optional;
@@ -44,20 +45,16 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.libreccm.security.Shiro;
 import org.libreccm.tests.categories.IntegrationTest;
-import org.librecms.attachments.AttachmentList;
-import org.librecms.contentsection.ContentItem;
-import org.librecms.contentsection.ContentItemRepository;
-import org.librecms.contentsection.FolderRepository;
 
 import javax.inject.Inject;
 
-import org.librecms.contentsection.Folder;
-
 import java.util.Locale;
 
 import javax.activation.MimeType;
 import javax.activation.MimeTypeParseException;
 
+import org.librecms.assets.File;
+
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
@@ -142,8 +139,9 @@ public class AssetManagerTest {
             .addPackage(com.arsdigita.util.Lockable.class.getPackage())
             .addPackage(com.arsdigita.web.BaseServlet.class.getPackage())
             .addPackage(org.librecms.Cms.class.getPackage())
-            .addPackage(org.librecms.assets.Asset.class.getPackage())
+            .addPackage(org.librecms.contentsection.Asset.class.getPackage())
-            .addPackage(org.librecms.attachments.AttachmentList.class
+            .addPackage(org.librecms.assets.BinaryAsset.class.getPackage())
+            .addPackage(org.librecms.contentsection.AttachmentList.class
                 .getPackage())
             .addPackage(org.librecms.lifecycle.Lifecycle.class.getPackage())
             .addPackage(org.librecms.contentsection.ContentSection.class
@@ -194,9 +192,9 @@ public class AssetManagerTest {
      */
     @Test
     @InSequence(100)
-    @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @UsingDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
     @ShouldMatchDataSet(
-        value = "datasets/org/librecms/assets/AssetManagerTest/after-share.xml",
+        value = "datasets/org/librecms/contentsection/AssetManagerTest/after-share.xml",
         excludeColumns = {"asset_id",
                           "categorization_id",
                           "id",
@@ -230,8 +228,8 @@ public class AssetManagerTest {
      */
     @Test(expected = IllegalArgumentException.class)
     @InSequence(110)
-    @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @UsingDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
-    @ShouldMatchDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @ShouldMatchDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void shareAssetNull() {
         final Folder folder = folderRepo.findById(-420L);
@@ -250,8 +248,8 @@ public class AssetManagerTest {
      */
     @Test(expected = IllegalArgumentException.class)
     @InSequence(120)
-    @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @UsingDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
-    @ShouldMatchDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @ShouldMatchDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void shareAssetFolderIsNull() throws MimeTypeParseException {
         final File file = new File();
@@ -270,8 +268,8 @@ public class AssetManagerTest {
      */
     @Test(expected = IllegalArgumentException.class)
     @InSequence(130)
-    @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @UsingDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
-    @ShouldMatchDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @ShouldMatchDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void shareAlreadySharedAsset() {
         final Folder folder = folderRepo.findById(-420L);
@@ -289,9 +287,9 @@ public class AssetManagerTest {
      */
     @Test
     @InSequence(300)
-    @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @UsingDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
     @ShouldMatchDataSet(
-        value = "datasets/org/librecms/assets/AssetManagerTest/"
+        value = "datasets/org/librecms/contentsection/AssetManagerTest/"
                     + "after-clean-orphaned.xml",
         excludeColumns = {"timestamp", "object_order"})
     public void cleanOrphanedAssets() {
@@ -305,9 +303,9 @@ public class AssetManagerTest {
      */
     @Test
     @InSequence(400)
-    @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @UsingDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
     @ShouldMatchDataSet(
-        value = "datasets/org/librecms/assets/AssetManagerTest/"
+        value = "datasets/org/librecms/contentsection/AssetManagerTest/"
                     + "after-move-to-other-folder.xml",
         excludeColumns = {"categorization_id",
                           "object_id",
@@ -330,9 +328,9 @@ public class AssetManagerTest {
      */
     @Test
     @InSequence(410)
-    @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @UsingDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
     @ShouldMatchDataSet(
-        value = "datasets/org/librecms/assets/AssetManagerTest/"
+        value = "datasets/org/librecms/contentsection/AssetManagerTest/"
                     + "after-move-to-other-contentsection.xml",
         excludeColumns = {"categorization_id",
                           "object_id",
@@ -356,8 +354,8 @@ public class AssetManagerTest {
      */
     @Test(expected = IllegalArgumentException.class)
     @InSequence(420)
-    @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @UsingDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
-    @ShouldMatchDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @ShouldMatchDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void moveAssetNull() {
         final Asset asset = null;
@@ -376,8 +374,8 @@ public class AssetManagerTest {
      */
     @Test(expected = IllegalArgumentException.class)
     @InSequence(430)
-    @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @UsingDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
-    @ShouldMatchDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @ShouldMatchDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void moveAssetTargetFolderIsNull() {
         final Asset asset = assetRepo.findById(-900L);
@@ -396,8 +394,8 @@ public class AssetManagerTest {
      */
     @Test(expected = IllegalArgumentException.class)
     @InSequence(430)
-    @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @UsingDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
-    @ShouldMatchDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @ShouldMatchDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void moveAssetTargetFolderIsNotAssetFolder() {
         final Asset asset = assetRepo.findById(-900L);
@@ -415,9 +413,9 @@ public class AssetManagerTest {
      */
     @Test
     @InSequence(500)
-    @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @UsingDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
     @ShouldMatchDataSet(
-        value = "datasets/org/librecms/assets/AssetManagerTest/"
+        value = "datasets/org/librecms/contentsection/AssetManagerTest/"
                     + "after-copy-to-other-folder.xml",
         excludeColumns = {"object_id",
                           "uuid",
@@ -443,9 +441,9 @@ public class AssetManagerTest {
      */
     @Test
     @InSequence(510)
-    @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @UsingDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
     @ShouldMatchDataSet(
-        value = "datasets/org/librecms/assets/AssetManagerTest/"
+        value = "datasets/org/librecms/contentsection/AssetManagerTest/"
                     + "after-copy-to-same-folder.xml",
         excludeColumns = {"object_id",
                           "uuid",
@@ -473,9 +471,9 @@ public class AssetManagerTest {
      */
     @Test
     @InSequence(520)
-    @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @UsingDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
     @ShouldMatchDataSet(
-        value = "datasets/org/librecms/assets/AssetManagerTest/"
+        value = "datasets/org/librecms/contentsection/AssetManagerTest/"
                     + "after-copy-to-other-contentsection.xml",
         excludeColumns = {"object_id",
                           "uuid",
@@ -503,8 +501,8 @@ public class AssetManagerTest {
      */
     @Test(expected = IllegalArgumentException.class)
     @InSequence(530)
-    @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @UsingDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
-    @ShouldMatchDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @ShouldMatchDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void copyAssetNull() {
         final Asset asset = null;
@@ -523,8 +521,8 @@ public class AssetManagerTest {
      */
     @Test(expected = IllegalArgumentException.class)
     @InSequence(540)
-    @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @UsingDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
-    @ShouldMatchDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @ShouldMatchDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void copyAssetTargetFolderIsNull() {
         final Asset asset = assetRepo.findById(-1100L);
@@ -543,8 +541,8 @@ public class AssetManagerTest {
      */
     @Test(expected = IllegalArgumentException.class)
     @InSequence(550)
-    @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @UsingDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
-    @ShouldMatchDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @ShouldMatchDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void copyAssetTargetFolderIsNotAssetFolder() {
         final Asset asset = assetRepo.findById(-1100L);
@@ -563,8 +561,8 @@ public class AssetManagerTest {
      */
     @Test
     @InSequence(600)
-    @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @UsingDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
-    @ShouldMatchDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @ShouldMatchDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
     public void verifyIsAssetInUse() {
         final Asset header = assetRepo.findById(-700L);
         final Asset phb = assetRepo.findById(-800L);
@@ -592,8 +590,8 @@ public class AssetManagerTest {
      */
     @Test
     @InSequence(700)
-    @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @UsingDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
-    @ShouldMatchDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @ShouldMatchDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
     public void verifyGetAssetPathWithoutContentSection() {
         final Asset header = assetRepo.findById(-700L);
         final Asset phb = assetRepo.findById(-800L);
@@ -626,8 +624,8 @@ public class AssetManagerTest {
      */
     @Test
     @InSequence(800)
-    @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @UsingDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
-    @ShouldMatchDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @ShouldMatchDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
     public void verifyGetAssetPathWithContentSection() {
         final Asset header = assetRepo.findById(-700L);
         final Asset phb = assetRepo.findById(-800L);
@@ -660,8 +658,8 @@ public class AssetManagerTest {
      */
     @Test
     @InSequence(900)
-    @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @UsingDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
-    @ShouldMatchDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @ShouldMatchDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
     public void verifyGetAssetFolder() {
         final Asset header = assetRepo.findById(-700L);
         final Asset phb = assetRepo.findById(-800L);
@@ -713,8 +711,8 @@ public class AssetManagerTest {
      */
     @Test
     @InSequence(1000)
-    @UsingDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @UsingDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
-    @ShouldMatchDataSet("datasets/org/librecms/assets/AssetManagerTest/data.xml")
+    @ShouldMatchDataSet("datasets/org/librecms/contentsection/AssetManagerTest/data.xml")
     public void verifyGetAssetFolders() {
         final Asset header = assetRepo.findById(-700L);
         final Asset phb = assetRepo.findById(-800L);

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

@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.librecms.assets;
+package org.librecms.contentsection;
 
 import static org.libreccm.testutils.DependenciesHelpers.*;
 
@@ -41,15 +41,17 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.libreccm.security.Shiro;
 import org.libreccm.tests.categories.IntegrationTest;
-import org.librecms.contentsection.ContentItem;
+import org.librecms.assets.BinaryAsset;
-import org.librecms.contentsection.Folder;
-import org.librecms.contentsection.FolderRepository;
 
 import java.util.List;
 import java.util.Optional;
 
 import javax.inject.Inject;
 
+import org.librecms.assets.File;
+import org.librecms.assets.Image;
+import org.librecms.assets.VideoAsset;
+
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
@@ -97,7 +99,7 @@ public class AssetRepositoryTest {
     public static WebArchive createDeployment() {
         return ShrinkWrap
             .create(WebArchive.class,
-                    "LibreCCM-org.librecms.assets.AssetRepositoryTest.war")
+                    "LibreCCM-org.librecms.contentsection.AssetRepositoryTest.war")
             .addPackage(org.libreccm.auditing.CcmRevision.class.getPackage())
             .addPackage(org.libreccm.categorization.Categorization.class
                 .getPackage())
@@ -131,8 +133,9 @@ public class AssetRepositoryTest {
             .addPackage(com.arsdigita.util.Lockable.class.getPackage())
             .addPackage(com.arsdigita.web.BaseServlet.class.getPackage())
             .addPackage(org.librecms.Cms.class.getPackage())
-            .addPackage(org.librecms.assets.Asset.class.getPackage())
+            .addPackage(org.librecms.contentsection.Asset.class.getPackage())
-            .addPackage(org.librecms.attachments.AttachmentList.class
+            .addPackage(org.librecms.assets.BinaryAsset.class.getPackage())
+            .addPackage(org.librecms.contentsection.AttachmentList.class
                 .getPackage())
             .addPackage(org.librecms.lifecycle.Lifecycle.class.getPackage())
             .addPackage(org.librecms.contentsection.ContentSection.class
@@ -181,9 +184,10 @@ public class AssetRepositoryTest {
      */
     @Test
     @InSequence(100)
-    @UsingDataSet("datasets/org/librecms/assets/AssetRepositoryTest/data.xml")
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml")
     @ShouldMatchDataSet(
-        value = "datasets/org/librecms/assets/AssetRepositoryTest/"
+        value = "datasets/org/librecms/contentsection/AssetRepositoryTest/"
                     + "after-delete.xml",
         excludeColumns = {"timestamp", "object_order"}
     )
@@ -202,8 +206,10 @@ public class AssetRepositoryTest {
      */
     @Test(expected = AssetInUseException.class)
     @InSequence(110)
-    @UsingDataSet("datasets/org/librecms/assets/AssetRepositoryTest/data.xml")
+    @UsingDataSet(
-    @ShouldMatchDataSet("datasets/org/librecms/assets/AssetRepositoryTest/"
+        "datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml")
+    @ShouldMatchDataSet(
+        "datasets/org/librecms/contentsection/AssetRepositoryTest/"
             + "data.xml")
     @ShouldThrowException(AssetInUseException.class)
     public void deleteUsedAsset() {
@@ -220,7 +226,8 @@ public class AssetRepositoryTest {
      */
     @Test
     @InSequence(200)
-    @UsingDataSet("datasets/org/librecms/assets/AssetRepositoryTest/data.xml")
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml")
     public void findAssetByUuid() {
         final Optional<Asset> header = assetRepo.findByUuid(
             "4635589f-b87a-46d9-979e-6af14af063e5");
@@ -232,15 +239,25 @@ public class AssetRepositoryTest {
             "5211bf56-c20b-40b3-8ef8-0c7d35325fda");
 
         assertThat(header.isPresent(), is(true));
-        assertThat(phb.isPresent(), is(true));
+        assertThat(header.get(), is(instanceOf(Asset.class)));
-        assertThat(datasheet.isPresent(), is(true));
+        assertThat(header.get(), is(instanceOf(BinaryAsset.class)));
-        assertThat(none.isPresent(), is(false));
+        assertThat(header.get(), is(instanceOf(Image.class)));
-
         assertThat(header.get().getDisplayName(), is(equalTo("header.png")));
+
+        assertThat(phb.isPresent(), is(true));
+        assertThat(phb.get(), is(instanceOf(Asset.class)));
+        assertThat(phb.get(), is(instanceOf(BinaryAsset.class)));
+        assertThat(phb.get(), is(instanceOf(Image.class)));
         assertThat(phb.get().getDisplayName(), is(equalTo("the-phb.png")));
+
+        assertThat(datasheet.isPresent(), is(true));
+        assertThat(datasheet.get(), is(instanceOf(Asset.class)));
+        assertThat(datasheet.get(), is(instanceOf(BinaryAsset.class)));
+        assertThat(datasheet.get(), is(instanceOf(File.class)));
         assertThat(datasheet.get().getDisplayName(), is(equalTo(
                    "product1-datasheet.pdf")));
 
+        assertThat(none.isPresent(), is(false));
     }
 
     /**
@@ -249,7 +266,8 @@ public class AssetRepositoryTest {
      */
     @Test
     @InSequence(210)
-    @UsingDataSet("datasets/org/librecms/assets/AssetRepositoryTest/data.xml")
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml")
     public void findAssetByUuidAndType() {
         final Optional<Asset> asset = assetRepo.findByUuidAndType(
             "4635589f-b87a-46d9-979e-6af14af063e5", Image.class);
@@ -268,7 +286,8 @@ public class AssetRepositoryTest {
      */
     @Test
     @InSequence(300)
-    @UsingDataSet("datasets/org/librecms/assets/AssetRepositoryTest/data.xml")
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml")
     public void findAssetByType() {
         final List<Asset> images = assetRepo.findByType(Image.class);
         final List<Asset> files = assetRepo.findByType(File.class);
@@ -295,7 +314,8 @@ public class AssetRepositoryTest {
      */
     @Test
     @InSequence(400)
-    @UsingDataSet("datasets/org/librecms/assets/AssetRepositoryTest/data.xml")
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml")
     public void findAssetsByFolder() {
         final Folder media = folderRepo.findById(-400L);
         final Folder data = folderRepo.findById(-500L);
@@ -314,7 +334,8 @@ public class AssetRepositoryTest {
      */
     @Test
     @InSequence(410)
-    @UsingDataSet("datasets/org/librecms/assets/AssetRepositoryTest/data.xml")
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml")
     public void countAssetsInFolder() {
         final Folder media = folderRepo.findById(-400L);
         final Folder data = folderRepo.findById(-500L);
@@ -329,7 +350,8 @@ public class AssetRepositoryTest {
      */
     @Test
     @InSequence(500)
-    @UsingDataSet("datasets/org/librecms/assets/AssetRepositoryTest/data.xml")
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml")
     public void filterAssetByFolderAndName() {
         final Folder media = folderRepo.findById(-400L);
 
@@ -351,7 +373,8 @@ public class AssetRepositoryTest {
      */
     @Test
     @InSequence(510)
-    @UsingDataSet("datasets/org/librecms/assets/AssetRepositoryTest/data.xml")
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml")
     public void countFilterAssetByFolderAndName() {
         final Folder media = folderRepo.findById(-400L);
 
@@ -368,7 +391,8 @@ public class AssetRepositoryTest {
      */
     @Test
     @InSequence(600)
-    @UsingDataSet("datasets/org/librecms/assets/AssetRepositoryTest/data.xml")
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml")
     public void filterAssetsByFolderAndType() {
         final Folder media = folderRepo.findById(-400L);
 
@@ -400,7 +424,8 @@ public class AssetRepositoryTest {
      */
     @Test
     @InSequence(610)
-    @UsingDataSet("datasets/org/librecms/assets/AssetRepositoryTest/data.xml")
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml")
     public void countFilterAssetsByFolderAndType() {
         final Folder media = folderRepo.findById(-400L);
 
@@ -419,7 +444,8 @@ public class AssetRepositoryTest {
      */
     @Test
     @InSequence(600)
-    @UsingDataSet("datasets/org/librecms/assets/AssetRepositoryTest/data.xml")
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml")
     public void filterAssetsByFolderAndTypeAndName() {
         final Folder media = folderRepo.findById(-400L);
 
@@ -440,7 +466,8 @@ public class AssetRepositoryTest {
      */
     @Test
     @InSequence(610)
-    @UsingDataSet("datasets/org/librecms/assets/AssetRepositoryTest/data.xml")
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml")
     public void countFilterAssetsByFolderAndTypeAndName() {
         final Folder media = folderRepo.findById(-400L);
 

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

@@ -16,7 +16,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.librecms.attachments;
+package org.librecms.contentsection;
+
+import org.librecms.contentsection.AttachmentList;
+import org.librecms.contentsection.AttachmentListManager;
 
 import static org.libreccm.testutils.DependenciesHelpers.*;
 
@@ -42,7 +45,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.libreccm.security.Shiro;
 import org.libreccm.tests.categories.IntegrationTest;
-import org.librecms.assets.Asset;
+import org.librecms.contentsection.Asset;
 import org.librecms.contentsection.ContentItem;
 import org.librecms.contentsection.ContentItemRepository;
 
@@ -132,9 +135,8 @@ public class AttachmentListManagerTest {
             .addPackage(com.arsdigita.util.Lockable.class.getPackage())
             .addPackage(com.arsdigita.web.BaseServlet.class.getPackage())
             .addPackage(org.librecms.Cms.class.getPackage())
-            .addPackage(org.librecms.assets.Asset.class.getPackage())
+            .addPackage(org.librecms.assets.BinaryAsset.class.getPackage())
-            .addPackage(org.librecms.attachments.AttachmentList.class
+            .addPackage(org.librecms.contentsection.Asset.class.getPackage())
-                .getPackage())
             .addPackage(org.librecms.lifecycle.Lifecycle.class.getPackage())
             .addPackage(org.librecms.contentsection.ContentSection.class
                 .getPackage())
@@ -183,7 +185,8 @@ public class AttachmentListManagerTest {
      */
     @Test
     @InSequence(100)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     public void getAttachmentListNames() {
         shiro.getSystemUser().execute(() -> {
@@ -201,8 +204,8 @@ public class AttachmentListManagerTest {
             assertThat(names1, is(not(nullValue())));
             assertThat(names1.size(), is(3));
             assertThat(names1.get(0), is("list1"));
-            assertThat(names1.get(1), is("list2"));
+            assertThat(names1.get(1), is("list1"));
-            assertThat(names1.get(2), is("list3"));
+            assertThat(names1.get(2), is("list2"));
 
             assertThat(names2, is(not(nullValue())));
             assertThat(names2.size(), is(2));
@@ -218,7 +221,8 @@ public class AttachmentListManagerTest {
      */
     @Test(expected = IllegalArgumentException.class)
     @InSequence(110)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void getAttachmentListNamesFromNull() {
@@ -237,7 +241,8 @@ public class AttachmentListManagerTest {
      */
     @Test
     @InSequence(200)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     public void getAttachmentList() {
         final Subject systemUser = shiro.getSystemUser();
@@ -284,7 +289,8 @@ public class AttachmentListManagerTest {
      */
     @Test(expected = IllegalArgumentException.class)
     @InSequence(210)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void getAttachmentListFromItemNull() {
@@ -303,7 +309,8 @@ public class AttachmentListManagerTest {
      */
     @Test(expected = IllegalArgumentException.class)
     @InSequence(220)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void getAttachmentListNameIsNull() {
@@ -325,7 +332,8 @@ public class AttachmentListManagerTest {
      */
     @Test(expected = IllegalArgumentException.class)
     @InSequence(230)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void getAttachmentListWithEmptyName() {
@@ -347,12 +355,15 @@ public class AttachmentListManagerTest {
      */
     @Test
     @InSequence(300)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldMatchDataSet(
-        value = "datasets/org/librecms/attachments/AttachmentListManagerTest/"
+        value
+            = "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
                   + "after-create.xml",
         excludeColumns = {"timestamp",
+                          "object_id",
                           "list_id",
                           "uuid"})
     public void createAttachmentList() {
@@ -370,14 +381,17 @@ public class AttachmentListManagerTest {
      */
     @Test(expected = IllegalArgumentException.class)
     @InSequence(310)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldMatchDataSet(
-        "datasets/org/librecms/attachments/AttachmentListManagerTest/"
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void createAttachmentListForItemNull() {
-        fail("Not implemented yet");
+        final ContentItem item = null;
+
+        listManager.createAttachmentList(item, "newList");
     }
 
     /**
@@ -388,13 +402,17 @@ public class AttachmentListManagerTest {
      */
     @Test(expected = IllegalArgumentException.class)
     @InSequence(320)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldMatchDataSet(
-        "datasets/org/librecms/attachments/AttachmentListManagerTest/"
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     public void createAttachmentListNameIsNull() {
-        fail("Not implemented yet");
+        final Optional<ContentItem> item = itemRepo.findById(-520);
+        assertThat(item.isPresent(), is(true));
+
+        listManager.createAttachmentList(item.get(), null);
     }
 
     /**
@@ -405,13 +423,17 @@ public class AttachmentListManagerTest {
      */
     @Test(expected = IllegalArgumentException.class)
     @InSequence(330)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldMatchDataSet(
-        "datasets/org/librecms/attachments/AttachmentListManagerTest/"
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     public void createAttachmentListNameIsEmpty() {
-        fail("Not implemented yet");
+        final Optional<ContentItem> item = itemRepo.findById(-520);
+        assertThat(item.isPresent(), is(true));
+
+        listManager.createAttachmentList(item.get(), "  ");
     }
 
     /**
@@ -421,13 +443,21 @@ public class AttachmentListManagerTest {
      */
     @Test
     @InSequence(400)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldMatchDataSet(
-        "datasets/org/librecms/attachments/AttachmentListManagerTest/"
+        value = "datasets/org/librecms/contentsection/"
-            + "after-create.xml")
+                    + "AttachmentListManagerTest/after-create-with-position.xml",
-    public void createAttachmentListAfterPosition() {
+        excludeColumns = {"timestamp",
-        fail("Not implemented yet");
+                          "object_id",
+                          "list_id",
+                          "uuid"})
+    public void createAttachmentListWithPosition() {
+        final Optional<ContentItem> item = itemRepo.findById(-510);
+        assertThat(item.isPresent(), is(true));
+
+        listManager.createAttachmentList(item.get(), "newList", 1);
     }
 
     /**
@@ -439,13 +469,22 @@ public class AttachmentListManagerTest {
      */
     @Test
     @InSequence(410)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldMatchDataSet(
-        "datasets/org/librecms/attachments/AttachmentListManagerTest/"
+        value = "datasets/org/librecms/contentsection/"
-            + "after-create-with-negative-position.xml")
+                    + "AttachmentListManagerTest/"
-    public void createAttachmentListNegativePosition() {
+                    + "after-create-with-negative-position.xml",
-        fail("Not implemented yet");
+        excludeColumns = {"timestamp",
+                          "object_id",
+                          "list_id",
+                          "uuid"})
+    public void createAttachmentListWithNegativePosition() {
+        final Optional<ContentItem> item = itemRepo.findById(-510);
+        assertThat(item.isPresent(), is(true));
+
+        listManager.createAttachmentList(item.get(), "newList", -3);
     }
 
     /**
@@ -458,13 +497,22 @@ public class AttachmentListManagerTest {
      */
     @Test
     @InSequence(420)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldMatchDataSet(
-        "datasets/org/librecms/attachments/AttachmentListManagerTest/"
+        value = "datasets/org/librecms/contentsection/"
-            + "after-create-after-last.xml")
+                    + "AttachmentListManagerTest/"
-    public void createAttachmentListAfterLastPosition() {
+                    + "after-create-after-last.xml",
-        fail("Not implemented yet");
+        excludeColumns = {"timestamp",
+                          "object_id",
+                          "list_id",
+                          "uuid"})
+    public void createAttachmentListWithPositionAfterLast() {
+        final Optional<ContentItem> item = itemRepo.findById(-510);
+        assertThat(item.isPresent(), is(true));
+
+        listManager.createAttachmentList(item.get(), "newList", 10);
     }
 
     /**
@@ -475,14 +523,17 @@ public class AttachmentListManagerTest {
      */
     @Test(expected = IllegalArgumentException.class)
     @InSequence(430)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldMatchDataSet(
-        "datasets/org/librecms/attachments/AttachmentListManagerTest/"
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
-    public void createAttachmentListAfterPositionForItemNull() {
+    public void createAttachmentListWithPositionForItemNull() {
-        fail("Not implemented yet");
+        final ContentItem item = null;
+
+        listManager.createAttachmentList(item, "newList", 10);
     }
 
     /**
@@ -493,14 +544,18 @@ public class AttachmentListManagerTest {
      */
     @Test(expected = IllegalArgumentException.class)
     @InSequence(440)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldMatchDataSet(
-        "datasets/org/librecms/attachments/AttachmentListManagerTest/"
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
-    public void createAttachmentListAfterPositionNameIsNull() {
+    public void createAttachmentListWithPositionNameIsNull() {
-        fail("Not implemented yet");
+        final Optional<ContentItem> item = itemRepo.findById(-510);
+        assertThat(item.isPresent(), is(true));
+
+        listManager.createAttachmentList(item.get(), null, 10);
     }
 
     /**
@@ -511,14 +566,18 @@ public class AttachmentListManagerTest {
      */
     @Test(expected = IllegalArgumentException.class)
     @InSequence(450)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldMatchDataSet(
-        "datasets/org/librecms/attachments/AttachmentListManagerTest/"
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
-    public void createAttachmentListAfterPositionNameIsEmpty() {
+    public void createAttachmentListWithPositionNameIsEmpty() {
-        fail("Not implemented yet");
+        final Optional<ContentItem> item = itemRepo.findById(-510);
+        assertThat(item.isPresent(), is(true));
+
+        listManager.createAttachmentList(item.get(), "   ", 10);
     }
 
     /**
@@ -529,13 +588,19 @@ public class AttachmentListManagerTest {
      */
     @Test
     @InSequence(500)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldMatchDataSet(
-        "datasets/org/librecms/attachments/AttachmentListManagerTest/"
+        value = "datasets/org/librecms/contentsection/"
-            + "after-remove.xml")
+                    + "AttachmentListManagerTest/after-remove.xml",
+        excludeColumns = {"timestamp"})
     public void removeAttachmentList() {
-        fail("Not implemented yet");
+        final Optional<ContentItem> item = itemRepo.findById(-510);
+        assertThat(item.isPresent(), is(true));
+        final AttachmentList list = item.get().getAttachments().get(0);
+
+        listManager.removeAttachmentList(list);
     }
 
     /**
@@ -545,29 +610,59 @@ public class AttachmentListManagerTest {
      */
     @Test(expected = IllegalArgumentException.class)
     @InSequence(510)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldMatchDataSet(
-        "datasets/org/librecms/attachments/AttachmentListManagerTest/"
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void removeAttachmentListNull() {
-        fail("Not implemented yet");
+        final AttachmentList list = null;
+
+        listManager.removeAttachmentList(list);
+
     }
 
     /**
-     * Tries to move an {@link AttachmentList} up one position up using
+     * Tries to move an {@link AttachmentList} up one position up (+1) using
      * {@link AttachmentListManager#moveUp(org.librecms.attachments.AttachmentList)}.
      */
     @Test
     @InSequence(600)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldMatchDataSet(
-        "datasets/org/librecms/attachments/AttachmentListManagerTest/"
+        value = "datasets/org/librecms/contentsection/"
-            + "after-move-up.xml")
+                    + "AttachmentListManagerTest/after-move-up.xml",
+        excludeColumns = {"timestamp"})
     public void moveUp() {
-        fail("Not implemented yet");
+        final Optional<ContentItem> item = itemRepo.findById(-510);
+        assertThat(item.isPresent(), is(true));
+        final AttachmentList list = item.get().getAttachments().get(0);
+
+        listManager.moveUp(list);
+    }
+
+    /**
+     * Tries to move the item of the last position up and verifies that this
+     * that cause any changes.
+     */
+    @Test
+    @InSequence(610)
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
+            + "data.xml")
+    @ShouldMatchDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
+            + "data.xml")
+    public void moveUpLast() {
+        final Optional<ContentItem> item = itemRepo.findById(-510);
+        assertThat(item.isPresent(), is(true));
+        final AttachmentList list = item.get().getAttachments().get(2);
+
+        listManager.moveUp(list);
     }
 
     /**
@@ -576,15 +671,18 @@ public class AttachmentListManagerTest {
      * throws an {@link IllegalArgumentException} if called for {@code null}.
      */
     @Test(expected = IllegalArgumentException.class)
-    @InSequence(510)
+    @InSequence(620)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldMatchDataSet(
-        "datasets/org/librecms/attachments/AttachmentListManagerTest/"
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void moveUpListNull() {
-        fail("Not implemented yet");
+        final AttachmentList list = null;
+
+        listManager.moveUp(list);
     }
 
     /**
@@ -592,14 +690,40 @@ public class AttachmentListManagerTest {
      * {@link AttachmentListManager#moveUp(org.librecms.attachments.AttachmentList)}.
      */
     @Test
-    @InSequence(600)
+    @InSequence(700)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldMatchDataSet(
-        "datasets/org/librecms/attachments/AttachmentListManagerTest/"
+        value = "datasets/org/librecms/contentsection/"
-            + "after-move-down.xml")
+                    + "AttachmentListManagerTest/after-move-down.xml",
+        excludeColumns = {"timestamp"})
     public void moveDown() {
-        fail("Not implemented yet");
+        final Optional<ContentItem> item = itemRepo.findById(-510);
+        assertThat(item.isPresent(), is(true));
+        final AttachmentList list = item.get().getAttachments().get(2);
+
+        listManager.moveDown(list);
+    }
+
+    /**
+     * Tries to move the item of the last position up and verifies that this
+     * that cause any changes.
+     */
+    @Test
+    @InSequence(710)
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
+            + "data.xml")
+    @ShouldMatchDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
+            + "data.xml")
+    public void moveDownFirst() {
+        final Optional<ContentItem> item = itemRepo.findById(-510);
+        assertThat(item.isPresent(), is(true));
+        final AttachmentList list = item.get().getAttachments().get(0);
+
+        listManager.moveDown(list);
     }
 
     /**
@@ -608,80 +732,19 @@ public class AttachmentListManagerTest {
      * throws an {@link IllegalArgumentException} if called for {@code null}.
      */
     @Test(expected = IllegalArgumentException.class)
-    @InSequence(510)
+    @InSequence(720)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
+    @UsingDataSet(
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldMatchDataSet(
-        "datasets/org/librecms/attachments/AttachmentListManagerTest/"
+        "datasets/org/librecms/contentsection/AttachmentListManagerTest/"
             + "data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void moveDownListNull() {
-        fail("Not implemented yet");
+        final AttachmentList list = null;
+
+        listManager.moveDown(list);
     }
 
-    /**
-     * Tries to move an {@link AttachmentList} to an specific position using
-     * {@link AttachmentListManager#moveTo(org.librecms.attachments.AttachmentList, long)}.
-     */
-    @Test
-    @InSequence(600)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
-                      + "data.xml")
-    @ShouldMatchDataSet(
-        "datasets/org/librecms/attachments/AttachmentListManagerTest/"
-            + "after-move-to.xml")
-    public void moveTo() {
-        fail("Not implemented yet");
-    }
-
-    /**
-     * Tries to move an {@link AttachmentList} to the first position using
-     * {@link AttachmentListManager#moveTo(org.librecms.attachments.AttachmentList, long)}
-     * with a negative value for {@code position}.
-     */
-    @Test
-    @InSequence(600)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
-                      + "data.xml")
-    @ShouldMatchDataSet(
-        "datasets/org/librecms/attachments/AttachmentListManagerTest/"
-            + "after-move-to-first.xml")
-    public void moveToNegativePosition() {
-        fail("Not implemented yet");
-    }
-
-    /**
-     * Tries to move an {@link AttachmentList} to the last position using
-     * {@link AttachmentListManager#moveTo(org.librecms.attachments.AttachmentList, long)}
-     * with a value larger than the number of attachment lists.
-     */
-    @Test
-    @InSequence(600)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
-                      + "data.xml")
-    @ShouldMatchDataSet(
-        "datasets/org/librecms/attachments/AttachmentListManagerTest/"
-            + "after-move-to-last.xml")
-    public void moveToLargerThanLast() {
-        fail("Not implemented yet");
-    }
-
-    /**
-     * Verifies that
-     * {@link AttachmentListManager#moveTo(org.librecms.attachments.AttachmentList, long)}
-     * throws an {@link IllegalArgumentException} if called with {@code null}
-     * for the attachment list to move.
-     */
-    @Test(expected = IllegalArgumentException.class)
-    @InSequence(510)
-    @UsingDataSet("datasets/org/librecms/attachments/AttachmentListManagerTest/"
-                      + "data.xml")
-    @ShouldMatchDataSet(
-        "datasets/org/librecms/attachments/AttachmentListManagerTest/"
-            + "data.xml")
-    @ShouldThrowException(IllegalArgumentException.class)
-    public void moveToListNull() {
-        fail("Not implemented yet");
-    }
 
 }

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

@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301  USA
  */
-package org.librecms.attachments;
+package org.librecms.contentsection;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -25,21 +25,20 @@ import org.libreccm.security.Group;
 import org.libreccm.security.Role;
 import org.libreccm.tests.categories.UnitTest;
 import org.libreccm.testutils.EqualsVerifier;
-import org.librecms.assets.Asset;
-import org.librecms.contentsection.ContentItem;
-import org.librecms.contentsection.ContentSection;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.UUID;
 
 /**
+ * Verifies the {@code equals} and {@code hashCode} methods of the classes
+ * {@link AttachmentsConfig}, {@link AttachmentList} and {@link ItemAttachment}.
  * 
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @RunWith(Parameterized.class)
 @org.junit.experimental.categories.Category(UnitTest.class)
-public class EqualsAndHashCodeTest extends EqualsVerifier {
+public class AttachmentsEqualsAndHashCodeTest extends EqualsVerifier {
 
     @Parameterized.Parameters(name = "{0}")
     public static Collection<Class<?>> data() {
@@ -50,7 +49,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
         });
     }
 
-    public EqualsAndHashCodeTest(final Class<?> clazz) {
+    public AttachmentsEqualsAndHashCodeTest(final Class<?> clazz) {
         super(clazz);
     }
 

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

@@ -127,8 +127,8 @@ public class ContentItemL10NManagerTest {
             .addPackage(com.arsdigita.util.Lockable.class.getPackage())
             .addPackage(com.arsdigita.web.BaseServlet.class.getPackage())
             .addPackage(org.librecms.Cms.class.getPackage())
-            .addPackage(org.librecms.assets.Asset.class.getPackage())
+            .addPackage(org.librecms.contentsection.Asset.class.getPackage())
-            .addPackage(org.librecms.attachments.AttachmentList.class
+            .addPackage(org.librecms.contentsection.AttachmentList.class
                 .getPackage())
             .addPackage(org.librecms.lifecycle.Lifecycle.class.getPackage())
             .addPackage(org.librecms.contentsection.ContentSection.class

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

@@ -151,8 +151,8 @@ public class ContentItemManagerTest {
             .addPackage(com.arsdigita.util.Lockable.class.getPackage())
             .addPackage(com.arsdigita.web.BaseServlet.class.getPackage())
             .addPackage(org.librecms.Cms.class.getPackage())
-            .addPackage(org.librecms.assets.Asset.class.getPackage())
+            .addPackage(org.librecms.contentsection.Asset.class.getPackage())
-            .addPackage(org.librecms.attachments.AttachmentList.class
+            .addPackage(org.librecms.contentsection.AttachmentList.class
                 .getPackage())
             .addPackage(org.librecms.lifecycle.Lifecycle.class.getPackage())
             .addPackage(org.librecms.contentsection.ContentSection.class

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

@@ -127,8 +127,8 @@ public class ContentItemRepositoryTest {
             .addPackage(com.arsdigita.util.Lockable.class.getPackage())
             .addPackage(com.arsdigita.web.BaseServlet.class.getPackage())
             .addPackage(org.librecms.Cms.class.getPackage())
-            .addPackage(org.librecms.assets.Asset.class.getPackage())
+            .addPackage(org.librecms.contentsection.Asset.class.getPackage())
-            .addPackage(org.librecms.attachments.AttachmentList.class
+            .addPackage(org.librecms.contentsection.AttachmentList.class
                 .getPackage())
             .addPackage(org.librecms.lifecycle.Lifecycle.class.getPackage())
             .addPackage(org.librecms.contentsection.ContentSection.class

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

@@ -162,8 +162,8 @@ public class ContentSectionManagerTest {
             .addPackage(com.arsdigita.util.Lockable.class.getPackage())
             .addPackage(com.arsdigita.web.BaseServlet.class.getPackage())
             .addPackage(org.librecms.Cms.class.getPackage())
-            .addPackage(org.librecms.assets.Asset.class.getPackage())
+            .addPackage(org.librecms.contentsection.Asset.class.getPackage())
-            .addPackage(org.librecms.attachments.AttachmentList.class
+            .addPackage(org.librecms.contentsection.AttachmentList.class
                 .getPackage())
             .addPackage(org.librecms.lifecycle.Lifecycle.class.getPackage())
             .addPackage(ContentSection.class.getPackage())

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

@@ -130,8 +130,8 @@ public class ContentTypeRepositoryTest {
             .addPackage(com.arsdigita.util.Lockable.class.getPackage())
             .addPackage(com.arsdigita.web.BaseServlet.class.getPackage())
             .addPackage(org.librecms.Cms.class.getPackage())
-            .addPackage(org.librecms.assets.Asset.class.getPackage())
+            .addPackage(org.librecms.contentsection.Asset.class.getPackage())
-            .addPackage(org.librecms.attachments.AttachmentList.class
+            .addPackage(org.librecms.contentsection.AttachmentList.class
                 .getPackage())
             .addPackage(org.librecms.lifecycle.Lifecycle.class.getPackage())
             .addPackage(org.librecms.contentsection.ContentSection.class

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

@@ -43,6 +43,30 @@ public class DatasetsTest extends DatasetsVerifier {
     @Parameterized.Parameters(name = "Dataset {0}")
     public static Collection<String> data() {
         return Arrays.asList(new String[]{
+            "/datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml",
+            "/datasets/org/librecms/contentsection/AssetRepositoryTest/after-delete.xml",
+            
+            "/datasets/org/librecms/contentsection/AssetManagerTest/data.xml",
+            "/datasets/org/librecms/contentsection/AssetManagerTest/after-clean-orphaned.xml",
+            "/datasets/org/librecms/contentsection/AssetManagerTest/after-copy-to-other-contentsection.xml",
+            "/datasets/org/librecms/contentsection/AssetManagerTest/after-copy-to-other-folder.xml",
+            "/datasets/org/librecms/contentsection/AssetManagerTest/after-copy-to-same-folder.xml",
+            "/datasets/org/librecms/contentsection/AssetManagerTest/after-share.xml",
+            "/datasets/org/librecms/contentsection/AssetManagerTest/after-move-to-other-contentsection.xml",
+            "/datasets/org/librecms/contentsection/AssetManagerTest/after-move-to-other-folder.xml",
+            
+            "/datasets/org/librecms/contentsection/AttachmentListManagerTest/data.xml",
+            "/datasets/org/librecms/contentsection/AttachmentListManagerTest/after-create-after-last.xml",
+            "/datasets/org/librecms/contentsection/AttachmentListManagerTest/after-create-with-negative-position.xml",
+            "/datasets/org/librecms/contentsection/AttachmentListManagerTest/after-create-with-position.xml",
+            "/datasets/org/librecms/contentsection/AttachmentListManagerTest/after-create.xml",
+            "/datasets/org/librecms/contentsection/AttachmentListManagerTest/after-move-down.xml",
+            "/datasets/org/librecms/contentsection/AttachmentListManagerTest/after-move-to-first.xml",
+            "/datasets/org/librecms/contentsection/AttachmentListManagerTest/after-move-to-last.xml",
+            "/datasets/org/librecms/contentsection/AttachmentListManagerTest/after-move-to.xml",
+            "/datasets/org/librecms/contentsection/AttachmentListManagerTest/after-move-up.xml",
+            "/datasets/org/librecms/contentsection/AttachmentListManagerTest/after-remove.xml",
+            
             "/datasets/org/librecms/contentsection/ContentSectionManagerTest/data.xml",
             "/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-contenttype.xml",
             "/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-contenttype.xml",

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

@@ -122,8 +122,8 @@ public class FolderManagerTest {
             .addPackage(com.arsdigita.util.Lockable.class.getPackage())
             .addPackage(com.arsdigita.web.BaseServlet.class.getPackage())
             .addPackage(org.librecms.Cms.class.getPackage())
-            .addPackage(org.librecms.assets.Asset.class.getPackage())
+            .addPackage(org.librecms.contentsection.Asset.class.getPackage())
-            .addPackage(org.librecms.attachments.AttachmentList.class
+            .addPackage(org.librecms.contentsection.AttachmentList.class
                 .getPackage())
             .addPackage(org.librecms.lifecycle.Lifecycle.class.getPackage())
             .addPackage(ContentSection.class.getPackage())

ccm-cms/src/test/resources/datasets/org/librecms/attachments/AttachmentListManagerTest/after-move-to-last.xml

@@ -1,508 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<dataset>
-
-    <ccm_core.ccm_revisions id="0"
-                            timestamp="1451602800" />
-    
-    <ccm_core.ccm_objects object_id="-100" 
-                          display_name="info"
-                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
-    <ccm_core.ccm_objects object_id="-200"
-                          display_name="info_root"
-                          uuid="82014239-9c06-486d-ae8c-4ae47f52a699" />
-    <ccm_core.ccm_objects object_id="-300"
-                          display_name="info_assets"
-                          uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
-    <ccm_core.ccm_objects object_id="-400"
-                          display_name="org.librecms.contenttypes.Article"
-                          uuid="bd061ab6-9c4f-45ff-ab69-f521008eeac3" />
-    <ccm_core.ccm_objects object_id="-510"
-                          display_name="article1"
-                          uuid="aed4b402-1180-46c6-b42d-7245f4dca248" />
-    <ccm_core.ccm_objects object_id="-520"
-                          display_name="article2"
-                          uuid="8b5a3eda-afbb-4d1c-a579-e2f45da6540a" />
-    <ccm_core.ccm_objects object_id="-610"
-                          display_name="sharedAsset1"
-                          uuid="3be6e343-1fc3-47a8-8a39-c729e11b485f" />
-    <ccm_core.ccm_objects object_id="-620"
-                          display_name="sharedAsset2"
-                          uuid="e6cb989b-021b-4a55-b095-63239a9425b2" />
-    <ccm_core.ccm_objects object_id="-630"
-                          display_name="sharedAsset3"
-                          uuid="2f66baca-7e5a-4556-a4c5-f9285d71293d" />
-    <ccm_core.ccm_objects object_id="-710"
-                          display_name="asset510-1a"
-                          uuid="cdc1bea7-7d3e-4019-a73c-d00e41efc9d0" />
-    <ccm_core.ccm_objects object_id="-720"
-                          display_name="asset510-1b"
-                          uuid="71479eae-28bd-446e-82a9-21581192d298" />
-    <ccm_core.ccm_objects object_id="-730"
-                          display_name="asset520-2a"
-                          uuid="1b8e879e-cf79-4c1d-a732-56b4053ec311" />
-    
-    <ccm_core.ccm_objects_aud object_id="-510"
-                              rev="0"
-                              revtype="0"
-                              display_name="article1" />
-    <ccm_core.ccm_objects_aud object_id="-520"
-                              rev="0"
-                              revtype="0"
-                              display_name="article2" />
-    <ccm_core.ccm_objects_aud object_id="-610"
-                              rev="0" 
-                              revtype="0"
-                              display_name="sharedAsset1" />
-    <ccm_core.ccm_objects_aud object_id="-620"
-                              rev="0" 
-                              revtype="0"
-                              display_name="sharedAsset2" />
-    <ccm_core.ccm_objects_aud object_id="-630"
-                              rev="0" 
-                              revtype="0"
-                              display_name="sharedAsset3" />
-    <ccm_core.ccm_objects_aud object_id="-710"
-                              rev="0" 
-                              revtype="0"
-                              display_name="asset510-1a" />
-    <ccm_core.ccm_objects_aud object_id="-720"
-                              rev="0" 
-                              revtype="0"
-                              display_name="asset510-1b" />
-    <ccm_core.ccm_objects_aud object_id="-730"
-                              rev="0" 
-                              revtype="0"
-                              display_name="asset520-2a" />
-    
-    <ccm_core.categories object_id="-200" 
-                         unique_id="82014239-9c06-486d-ae8c-4ae47f52a699" 
-                         name="info_root" 
-                         enabled="true" 
-                         visible="true" 
-                         abstract_category="false" 
-                         category_order="1" />
-    <ccm_core.categories object_id="-300"
-                         unique_id="b163f73c-9ac2-44d7-a037-de621f5ca828" 
-                         name="info_assets" 
-                         enabled="true" 
-                         visible="true" 
-                         abstract_category="false" 
-                         category_order="1"/>
-
-    <ccm_core.category_titles object_id="-200"
-                              locale="en"
-                              localized_value="info_root" />
-    <ccm_core.category_titles object_id="-300"
-                              locale="en"
-                              localized_value="info_assets" />
-    
-    <ccm_core.resources object_id="-100" 
-                        created="2016-07-15" />
-    
-    <ccm_core.applications object_id="-100"
-                           application_type="org.librecms.contentsection.ContentSection"
-                           primary_url="info" />
-    
-    <ccm_cms.folders object_id="-200"
-                     type="DOCUMENTS_FOLDER" />
-    <ccm_cms.folders object_id="-300"
-                     type="ASSETS_FOLDER" />
-    
-    <ccm_cms.content_sections object_id="-100"
-                              label="info"
-                              root_documents_folder_id="-200"
-                              root_assets_folder_id="-300" />
-    
-    <ccm_cms.folder_content_section_map folder_id="-200" 
-                                        content_section_id="-100" />
-    <ccm_cms.folder_content_section_map folder_id="-300" 
-                                        content_section_id="-100" />
-
-    <ccm_cms.content_types object_id="-400" 
-                           content_item_class="org.librecms.contenttypes.Article" 
-                           content_section_id="-100" />
-    
-    <ccm_cms.content_items object_id="-510" 
-                           item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248"
-                           version="DRAFT"
-                           content_type_id="-400" />
-    <ccm_cms.content_items object_id="-520" 
-                           item_uuid="8b5a3eda-afbb-4d1c-a579-e2f45da6540a"
-                           version="DRAFT"
-                           content_type_id="-400" />
-    
-    <ccm_cms.articles object_id="-510" />
-    <ccm_cms.articles object_id="-520" />
-    
-    <ccm_cms.article_texts 
-        object_id="-510"
-        locale="en" 
-        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
-    <ccm_cms.article_texts 
-        object_id="-520"
-        locale="en" 
-        localized_value="In hac habitasse platea dictumst." />
-
-    <ccm_cms.article_texts_aud 
-        rev="0" 
-        object_id="-510" 
-        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
-        locale="en" 
-        revtype="0" />
-    <ccm_cms.article_texts_aud 
-        rev="0" 
-        object_id="-520" 
-        localized_value="In hac habitasse platea dictumst." 
-        locale="en" 
-        revtype="0" />
-    
-    <ccm_cms.assets object_id="-610" />
-    <ccm_cms.assets object_id="-620" />
-    <ccm_cms.assets object_id="-630" />
-    <ccm_cms.assets object_id="-710" />
-    <ccm_cms.assets object_id="-720" />
-    <ccm_cms.assets object_id="-730" />
-    
-    <ccm_cms.assets_aud object_id="-610"
-                        rev="0" />
-    <ccm_cms.assets_aud object_id="-620"
-                        rev="0" />
-    <ccm_cms.assets_aud object_id="-630"
-                        rev="0" />
-    <ccm_cms.assets_aud object_id="-710"
-                        rev="0" />
-    <ccm_cms.assets_aud object_id="-720"
-                        rev="0" />
-    <ccm_cms.assets_aud object_id="-730"
-                        rev="0" />
-    
-    <ccm_cms.asset_titles asset_id="-610"
-                          localized_value="sharedAsset1"
-                          locale="en" />
-    <ccm_cms.asset_titles asset_id="-620"
-                          localized_value="sharedAsset2"
-                          locale="en" />
-    <ccm_cms.asset_titles asset_id="-630"
-                          localized_value="sharedAsset3"
-                          locale="en" />
-    <ccm_cms.asset_titles asset_id="-710"
-                          localized_value="asset-510-1a"
-                          locale="en" />
-    <ccm_cms.asset_titles asset_id="-720"
-                          localized_value="asset-510-1b"
-                          locale="en" />
-    <ccm_cms.asset_titles asset_id="-730"
-                          localized_value="asset-520-2a"
-                          locale="en" />
-    
-    <ccm_cms.asset_titles_aud asset_id="-610"
-                              rev="0"
-                              revtype="0" 
-                              localized_value="sharedAsset1"
-                              locale="en" />
-    <ccm_cms.asset_titles_aud asset_id="-620"
-                              rev="0"
-                              revtype="0" 
-                              localized_value="sharedAsset2"
-                              locale="en" />
-    <ccm_cms.asset_titles_aud asset_id="-630"
-                              rev="0"
-                              revtype="0" 
-                              localized_value="sharedAsset3"
-                              locale="en" />
-    <ccm_cms.asset_titles_aud asset_id="-710"
-                              rev="0"
-                              revtype="0" 
-                              localized_value="asset510-1a"
-                              locale="en" />
-    <ccm_cms.asset_titles_aud asset_id="-720"
-                              rev="0"
-                              revtype="0" 
-                              localized_value="asset510-1b"
-                              locale="en" />
-    <ccm_cms.asset_titles_aud asset_id="-730"
-                              rev="0"
-                              revtype="0" 
-                              localized_value="asset520-2a"
-                              locale="en" />
-    
-    <ccm_cms.binary_assets object_id="-610"
-                           filename="shared-asset-1.pdf"
-                           mime_type="application/pdf"
-                           data_size="0" />
-    <ccm_cms.binary_assets object_id="-620"
-                           filename="shared-asset-2.pdf"
-                           mime_type="application/pdf"
-                           data_size="0" />
-    <ccm_cms.binary_assets object_id="-630"
-                           filename="shared-asset-3.pdf"
-                           mime_type="application/pdf"
-                           data_size="0" />
-    <ccm_cms.binary_assets object_id="-710"
-                           filename="asset-510-1a.pdf"
-                           mime_type="application/pdf"
-                           data_size="0" />
-    <ccm_cms.binary_assets object_id="-720"
-                           filename="asset-510-1b.pdf"
-                           mime_type="application/pdf"
-                           data_size="0" />
-    <ccm_cms.binary_assets object_id="-730"
-                           filename="asset-520-2a.pdf"
-                           mime_type="application/pdf"
-                           data_size="0" />
-    
-    <ccm_cms.binary_assets_aud object_id="-610"
-                               rev="0"
-                               filename="shared-asset-1.pdf"
-                               mime_type="application/pdf"
-                               data_size="0" />
-    <ccm_cms.binary_assets_aud object_id="-620"
-                               rev="0"
-                               filename="shared-asset-2.pdf"
-                               mime_type="application/pdf"
-                               data_size="0" />
-    <ccm_cms.binary_assets_aud object_id="-630"
-                               rev="0"
-                               filename="shared-asset-3.pdf"
-                               mime_type="application/pdf"
-                               data_size="0" />
-    <ccm_cms.binary_assets_aud object_id="-710"
-                               rev="0"
-                               filename="asset-510-1a.pdf"
-                               mime_type="application/pdf"
-                               data_size="0" />
-    <ccm_cms.binary_assets_aud object_id="-720"
-                               rev="0"
-                               filename="asset-510-1b.pdf"
-                               mime_type="application/pdf"
-                               data_size="0" />
-    <ccm_cms.binary_assets_aud object_id="-730"
-                               rev="0"
-                               filename="asset-520-2a.pdf"
-                               mime_type="application/pdf"
-                               data_size="0" />
-    
-    <ccm_cms.files object_id="-610" />
-    <ccm_cms.files object_id="-620" />
-    <ccm_cms.files object_id="-630" />
-    <ccm_cms.files object_id="-710" />
-    <ccm_cms.files object_id="-720" />
-    <ccm_cms.files object_id="-730" />
-    
-    <ccm_cms.files_aud object_id="-610" 
-                       rev="0" />
-    <ccm_cms.files_aud object_id="-620" 
-                       rev="0" />
-    <ccm_cms.files_aud object_id="-630" 
-                       rev="0" />
-    <ccm_cms.files_aud object_id="-710" 
-                       rev="0" />
-    <ccm_cms.files_aud object_id="-720" 
-                       rev="0" />
-    <ccm_cms.files_aud object_id="-730" 
-                       rev="0" />
-        
-    <ccm_core.categorizations categorization_id="-30100" 
-                              category_id="-200" 
-                              object_id="-510" 
-                              category_order="1" 
-                              object_order="1" 
-                              category_index="false"
-                              type="folder" />
-    <ccm_core.categorizations categorization_id="-30200" 
-                              category_id="-200" 
-                              object_id="-520" 
-                              category_order="1" 
-                              object_order="2" 
-                              category_index="false"
-                              type="folder" />
-    <ccm_core.categorizations categorization_id="-30300"
-                              category_id="-300"
-                              object_id="-610"
-                              category_order="1"
-                              object_order="1"
-                              category_index="false"
-                              type="folder" />
-    <ccm_core.categorizations categorization_id="-30340"
-                              category_id="-300"
-                              object_id="-620"
-                              category_order="1"
-                              object_order="2"
-                              category_index="false"
-                              type="folder" />
-    <ccm_core.categorizations categorization_id="-30500"
-                              category_id="-300"
-                              object_id="-630"
-                              category_order="1"
-                              object_order="1"
-                              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="-510" />
-    <ccm_cms.attachment_lists list_id="-510020"
-                              name="list2"
-                              list_order="2"
-                              uuid="57850f9c-e191-4f6f-9537-d5c2d2f118ec"
-                              item_id="-510" />
-    <ccm_cms.attachment_lists list_id="-510030"
-                              name="list3"
-                              list_order="3"
-                              uuid="a0c2ba42-d506-48c0-b7cc-d32b2a031a50"
-                              item_id="-510" />
-    <ccm_cms.attachment_lists list_id="-520010"
-                              name="list1"
-                              list_order="1"
-                              uuid="7f954258-3ec9-4eee-bafe-5339ebf8b832"
-                              item_id="-520" />
-    <ccm_cms.attachment_lists list_id="-520020"
-                              name="list2"
-                              list_order="1"
-                              uuid="a6841869-6ebd-4a14-9c52-627cfc880f4e"
-                              item_id="-520" />
-    
-    <ccm_cms.attachment_lists_aud list_id="-510010" 
-                                  rev="0"
-                                  revtype="0"
-                                  name="list1"
-                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
-                                  item_id="-510" />
-    <ccm_cms.attachment_lists_aud list_id="-510020" 
-                                  rev="0"
-                                  revtype="0"
-                                  name="list2"
-                                  uuid="57850f9c-e191-4f6f-9537-d5c2d2f118ec"
-                                  itme_id="-510" />
-    <ccm_cms.attachment_lists_aud list_id="-510030" 
-                                  rev="0"
-                                  revtype="0"
-                                  name="list3"
-                                  uuid="a0c2ba42-d506-48c0-b7cc-d32b2a031a50"
-                                  item_id="-510" />
-    <ccm_cms.attachment_lists_aud list_id="-520010" 
-                                  rev="0"
-                                  revtype="0"
-                                  name="list1"
-                                  uuid="7f954258-3ec9-4eee-bafe-5339ebf8b832"
-                                  item_id="-520" />
-    <ccm_cms.attachment_lists_aud list_id="-520020" 
-                                  rev="0"
-                                  revtype="0"
-                                  name="list1"
-                                  uuid="a6841869-6ebd-4a14-9c52-627cfc880f4e"
-                                  item_id="-520" />
-    
-    <ccm_cms.attachments attachment_id="-510110"
-                         sort_key="1"
-                         uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
-                         asset_id="-710"
-                         attachment_list_id="-510010" />
-    <ccm_cms.attachments attachment_id="-510120"
-                         sort_key="2"
-                         uuid="5a34deae-9e3a-41e8-abd8-6a7d10dd9e7d"
-                         asset_id="-720"
-                         attachment_list_id="-510010" />
-    <ccm_cms.attachments attachment_id="-510130"
-                         sort_key="3"
-                         uuid="9e34627c-2da9-45fe-aae3-48801bd27cbe"
-                         asset_id="-610"
-                         attachment_list_id="-510010" />
-    <ccm_cms.attachments attachment_id="-510140"
-                         sort_key="1"
-                         uuid="6b5f86db-dd35-4674-a089-2a0b999a17c7"
-                         asset_id="-620"
-                         attachment_list_id="-510020" />
-    <ccm_cms.attachments attachment_id="-510150"
-                         sort_key="1"
-                         uuid="395c43dc-4aea-43e3-a2de-13e10f3a63f7"
-                         asset_id="-630"
-                         attachment_list_id="-510030" />
-    <ccm_cms.attachments attachment_id="-520110"
-                         sort_key="1"
-                         uuid="192d338b-8267-4566-a509-918d3323bf74"
-                         asset_id="-620"
-                         attachment_list_id="-520010" />
-    <ccm_cms.attachments attachment_id="-520120"
-                         sort_key="2"
-                         uuid="7cf32235-2794-457c-8436-e82bf1693382"
-                         asset_id="-630"
-                         attachment_list_id="-520010" />
-    <ccm_cms.attachments attachment_id="-520130"
-                         sort_key="1"
-                         uuid="324c95da-b44d-415e-b20a-612b94b9d604"
-                         asset_id="-730"
-                         attachment_list_id="-520020" />
-    <ccm_cms.attachments attachment_id="-520140"
-                         sort_key="2"
-                         uuid="d4b764cb-63d7-460f-87f8-f12032cab17c"
-                         asset_id="-610"
-                         attachment_list_id="-520020" />
-    
-    <ccm_cms.attachments_aud attachment_id="-510110"
-                             rev="0"
-                             revtype="0"
-                             sort_key="1"
-                             uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
-                             asset_id="-710"
-                             attachment_list_id="-510010" />
-    <ccm_cms.attachments_aud attachment_id="-510120"
-                             rev="0"
-                             revtype="0"
-                             sort_key="2"
-                             uuid="5a34deae-9e3a-41e8-abd8-6a7d10dd9e7d"
-                             asset_id="-720"
-                             attachment_list_id="-510010" />
-    <ccm_cms.attachments_aud attachment_id="-510130"
-                             rev="0"
-                             revtype="0"
-                             sort_key="3"
-                             uuid="9e34627c-2da9-45fe-aae3-48801bd27cbe"
-                             asset_id="-610"
-                             attachment_list_id="-510010" />
-    <ccm_cms.attachments_aud attachment_id="-510140"
-                             rev="0"
-                             revtype="0"
-                             sort_key="1"
-                             uuid="6b5f86db-dd35-4674-a089-2a0b999a17c7"
-                             asset_id="-620"
-                             attachment_list_id="-510020" />
-    <ccm_cms.attachments_aud attachment_id="-510150"
-                             rev="0"
-                             revtype="0"
-                             sort_key="1"
-                             uuid="395c43dc-4aea-43e3-a2de-13e10f3a63f7"
-                             asset_id="-630"
-                             attachment_list_id="-510030" />
-    <ccm_cms.attachments_aud attachment_id="-520110"
-                             rev="0"
-                             revtype="0"
-                             sort_key="1"
-                             uuid="192d338b-8267-4566-a509-918d3323bf74"
-                             asset_id="-620"
-                             attachment_list_id="-520010" />
-    <ccm_cms.attachments_aud attachment_id="-520120"
-                             rev="0"
-                             revtype="0"
-                             sort_key="2"
-                             uuid="7cf32235-2794-457c-8436-e82bf1693382"
-                             asset_id="-630"
-                             attachment_list_id="-520010" />
-    <ccm_cms.attachments_aud attachment_id="-520130"
-                             rev="0"
-                             revtype="0"
-                             sort_key="1"
-                             uuid="324c95da-b44d-415e-b20a-612b94b9d604"
-                             asset_id="-730"
-                             attachment_list_id="-520020" />
-    <ccm_cms.attachments_aud attachment_id="-520140"
-                             rev="0"
-                             revtype="0"
-                             sort_key="2"
-                             uuid="d4b764cb-63d7-460f-87f8-f12032cab17c"
-                             asset_id="-610"
-                             attachment_list_id="-520020" />
-    
-</dataset>

ccm-cms/src/test/resources/datasets/org/librecms/attachments/AttachmentListManagerTest/after-move-to.xml

@@ -1,508 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<dataset>
-
-    <ccm_core.ccm_revisions id="0"
-                            timestamp="1451602800" />
-    
-    <ccm_core.ccm_objects object_id="-100" 
-                          display_name="info"
-                          uuid="963bcae7-3aeb-4b62-891c-e16c4defa1f2" />
-    <ccm_core.ccm_objects object_id="-200"
-                          display_name="info_root"
-                          uuid="82014239-9c06-486d-ae8c-4ae47f52a699" />
-    <ccm_core.ccm_objects object_id="-300"
-                          display_name="info_assets"
-                          uuid="b163f73c-9ac2-44d7-a037-de621f5ca828" />
-    <ccm_core.ccm_objects object_id="-400"
-                          display_name="org.librecms.contenttypes.Article"
-                          uuid="bd061ab6-9c4f-45ff-ab69-f521008eeac3" />
-    <ccm_core.ccm_objects object_id="-510"
-                          display_name="article1"
-                          uuid="aed4b402-1180-46c6-b42d-7245f4dca248" />
-    <ccm_core.ccm_objects object_id="-520"
-                          display_name="article2"
-                          uuid="8b5a3eda-afbb-4d1c-a579-e2f45da6540a" />
-    <ccm_core.ccm_objects object_id="-610"
-                          display_name="sharedAsset1"
-                          uuid="3be6e343-1fc3-47a8-8a39-c729e11b485f" />
-    <ccm_core.ccm_objects object_id="-620"
-                          display_name="sharedAsset2"
-                          uuid="e6cb989b-021b-4a55-b095-63239a9425b2" />
-    <ccm_core.ccm_objects object_id="-630"
-                          display_name="sharedAsset3"
-                          uuid="2f66baca-7e5a-4556-a4c5-f9285d71293d" />
-    <ccm_core.ccm_objects object_id="-710"
-                          display_name="asset510-1a"
-                          uuid="cdc1bea7-7d3e-4019-a73c-d00e41efc9d0" />
-    <ccm_core.ccm_objects object_id="-720"
-                          display_name="asset510-1b"
-                          uuid="71479eae-28bd-446e-82a9-21581192d298" />
-    <ccm_core.ccm_objects object_id="-730"
-                          display_name="asset520-2a"
-                          uuid="1b8e879e-cf79-4c1d-a732-56b4053ec311" />
-    
-    <ccm_core.ccm_objects_aud object_id="-510"
-                              rev="0"
-                              revtype="0"
-                              display_name="article1" />
-    <ccm_core.ccm_objects_aud object_id="-520"
-                              rev="0"
-                              revtype="0"
-                              display_name="article2" />
-    <ccm_core.ccm_objects_aud object_id="-610"
-                              rev="0" 
-                              revtype="0"
-                              display_name="sharedAsset1" />
-    <ccm_core.ccm_objects_aud object_id="-620"
-                              rev="0" 
-                              revtype="0"
-                              display_name="sharedAsset2" />
-    <ccm_core.ccm_objects_aud object_id="-630"
-                              rev="0" 
-                              revtype="0"
-                              display_name="sharedAsset3" />
-    <ccm_core.ccm_objects_aud object_id="-710"
-                              rev="0" 
-                              revtype="0"
-                              display_name="asset510-1a" />
-    <ccm_core.ccm_objects_aud object_id="-720"
-                              rev="0" 
-                              revtype="0"
-                              display_name="asset510-1b" />
-    <ccm_core.ccm_objects_aud object_id="-730"
-                              rev="0" 
-                              revtype="0"
-                              display_name="asset520-2a" />
-    
-    <ccm_core.categories object_id="-200" 
-                         unique_id="82014239-9c06-486d-ae8c-4ae47f52a699" 
-                         name="info_root" 
-                         enabled="true" 
-                         visible="true" 
-                         abstract_category="false" 
-                         category_order="1" />
-    <ccm_core.categories object_id="-300"
-                         unique_id="b163f73c-9ac2-44d7-a037-de621f5ca828" 
-                         name="info_assets" 
-                         enabled="true" 
-                         visible="true" 
-                         abstract_category="false" 
-                         category_order="1"/>
-
-    <ccm_core.category_titles object_id="-200"
-                              locale="en"
-                              localized_value="info_root" />
-    <ccm_core.category_titles object_id="-300"
-                              locale="en"
-                              localized_value="info_assets" />
-    
-    <ccm_core.resources object_id="-100" 
-                        created="2016-07-15" />
-    
-    <ccm_core.applications object_id="-100"
-                           application_type="org.librecms.contentsection.ContentSection"
-                           primary_url="info" />
-    
-    <ccm_cms.folders object_id="-200"
-                     type="DOCUMENTS_FOLDER" />
-    <ccm_cms.folders object_id="-300"
-                     type="ASSETS_FOLDER" />
-    
-    <ccm_cms.content_sections object_id="-100"
-                              label="info"
-                              root_documents_folder_id="-200"
-                              root_assets_folder_id="-300" />
-    
-    <ccm_cms.folder_content_section_map folder_id="-200" 
-                                        content_section_id="-100" />
-    <ccm_cms.folder_content_section_map folder_id="-300" 
-                                        content_section_id="-100" />
-
-    <ccm_cms.content_types object_id="-400" 
-                           content_item_class="org.librecms.contenttypes.Article" 
-                           content_section_id="-100" />
-    
-    <ccm_cms.content_items object_id="-510" 
-                           item_uuid="aed4b402-1180-46c6-b42d-7245f4dca248"
-                           version="DRAFT"
-                           content_type_id="-400" />
-    <ccm_cms.content_items object_id="-520" 
-                           item_uuid="8b5a3eda-afbb-4d1c-a579-e2f45da6540a"
-                           version="DRAFT"
-                           content_type_id="-400" />
-    
-    <ccm_cms.articles object_id="-510" />
-    <ccm_cms.articles object_id="-520" />
-    
-    <ccm_cms.article_texts 
-        object_id="-510"
-        locale="en" 
-        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." />
-    <ccm_cms.article_texts 
-        object_id="-520"
-        locale="en" 
-        localized_value="In hac habitasse platea dictumst." />
-
-    <ccm_cms.article_texts_aud 
-        rev="0" 
-        object_id="-510" 
-        localized_value="Quisque varius turpis et nibh rhoncus consequat. In sapien metus, fermentum quis." 
-        locale="en" 
-        revtype="0" />
-    <ccm_cms.article_texts_aud 
-        rev="0" 
-        object_id="-520" 
-        localized_value="In hac habitasse platea dictumst." 
-        locale="en" 
-        revtype="0" />
-    
-    <ccm_cms.assets object_id="-610" />
-    <ccm_cms.assets object_id="-620" />
-    <ccm_cms.assets object_id="-630" />
-    <ccm_cms.assets object_id="-710" />
-    <ccm_cms.assets object_id="-720" />
-    <ccm_cms.assets object_id="-730" />
-    
-    <ccm_cms.assets_aud object_id="-610"
-                        rev="0" />
-    <ccm_cms.assets_aud object_id="-620"
-                        rev="0" />
-    <ccm_cms.assets_aud object_id="-630"
-                        rev="0" />
-    <ccm_cms.assets_aud object_id="-710"
-                        rev="0" />
-    <ccm_cms.assets_aud object_id="-720"
-                        rev="0" />
-    <ccm_cms.assets_aud object_id="-730"
-                        rev="0" />
-    
-    <ccm_cms.asset_titles asset_id="-610"
-                          localized_value="sharedAsset1"
-                          locale="en" />
-    <ccm_cms.asset_titles asset_id="-620"
-                          localized_value="sharedAsset2"
-                          locale="en" />
-    <ccm_cms.asset_titles asset_id="-630"
-                          localized_value="sharedAsset3"
-                          locale="en" />
-    <ccm_cms.asset_titles asset_id="-710"
-                          localized_value="asset-510-1a"
-                          locale="en" />
-    <ccm_cms.asset_titles asset_id="-720"
-                          localized_value="asset-510-1b"
-                          locale="en" />
-    <ccm_cms.asset_titles asset_id="-730"
-                          localized_value="asset-520-2a"
-                          locale="en" />
-    
-    <ccm_cms.asset_titles_aud asset_id="-610"
-                              rev="0"
-                              revtype="0" 
-                              localized_value="sharedAsset1"
-                              locale="en" />
-    <ccm_cms.asset_titles_aud asset_id="-620"
-                              rev="0"
-                              revtype="0" 
-                              localized_value="sharedAsset2"
-                              locale="en" />
-    <ccm_cms.asset_titles_aud asset_id="-630"
-                              rev="0"
-                              revtype="0" 
-                              localized_value="sharedAsset3"
-                              locale="en" />
-    <ccm_cms.asset_titles_aud asset_id="-710"
-                              rev="0"
-                              revtype="0" 
-                              localized_value="asset510-1a"
-                              locale="en" />
-    <ccm_cms.asset_titles_aud asset_id="-720"
-                              rev="0"
-                              revtype="0" 
-                              localized_value="asset510-1b"
-                              locale="en" />
-    <ccm_cms.asset_titles_aud asset_id="-730"
-                              rev="0"
-                              revtype="0" 
-                              localized_value="asset520-2a"
-                              locale="en" />
-    
-    <ccm_cms.binary_assets object_id="-610"
-                           filename="shared-asset-1.pdf"
-                           mime_type="application/pdf"
-                           data_size="0" />
-    <ccm_cms.binary_assets object_id="-620"
-                           filename="shared-asset-2.pdf"
-                           mime_type="application/pdf"
-                           data_size="0" />
-    <ccm_cms.binary_assets object_id="-630"
-                           filename="shared-asset-3.pdf"
-                           mime_type="application/pdf"
-                           data_size="0" />
-    <ccm_cms.binary_assets object_id="-710"
-                           filename="asset-510-1a.pdf"
-                           mime_type="application/pdf"
-                           data_size="0" />
-    <ccm_cms.binary_assets object_id="-720"
-                           filename="asset-510-1b.pdf"
-                           mime_type="application/pdf"
-                           data_size="0" />
-    <ccm_cms.binary_assets object_id="-730"
-                           filename="asset-520-2a.pdf"
-                           mime_type="application/pdf"
-                           data_size="0" />
-    
-    <ccm_cms.binary_assets_aud object_id="-610"
-                               rev="0"
-                               filename="shared-asset-1.pdf"
-                               mime_type="application/pdf"
-                               data_size="0" />
-    <ccm_cms.binary_assets_aud object_id="-620"
-                               rev="0"
-                               filename="shared-asset-2.pdf"
-                               mime_type="application/pdf"
-                               data_size="0" />
-    <ccm_cms.binary_assets_aud object_id="-630"
-                               rev="0"
-                               filename="shared-asset-3.pdf"
-                               mime_type="application/pdf"
-                               data_size="0" />
-    <ccm_cms.binary_assets_aud object_id="-710"
-                               rev="0"
-                               filename="asset-510-1a.pdf"
-                               mime_type="application/pdf"
-                               data_size="0" />
-    <ccm_cms.binary_assets_aud object_id="-720"
-                               rev="0"
-                               filename="asset-510-1b.pdf"
-                               mime_type="application/pdf"
-                               data_size="0" />
-    <ccm_cms.binary_assets_aud object_id="-730"
-                               rev="0"
-                               filename="asset-520-2a.pdf"
-                               mime_type="application/pdf"
-                               data_size="0" />
-    
-    <ccm_cms.files object_id="-610" />
-    <ccm_cms.files object_id="-620" />
-    <ccm_cms.files object_id="-630" />
-    <ccm_cms.files object_id="-710" />
-    <ccm_cms.files object_id="-720" />
-    <ccm_cms.files object_id="-730" />
-    
-    <ccm_cms.files_aud object_id="-610" 
-                       rev="0" />
-    <ccm_cms.files_aud object_id="-620" 
-                       rev="0" />
-    <ccm_cms.files_aud object_id="-630" 
-                       rev="0" />
-    <ccm_cms.files_aud object_id="-710" 
-                       rev="0" />
-    <ccm_cms.files_aud object_id="-720" 
-                       rev="0" />
-    <ccm_cms.files_aud object_id="-730" 
-                       rev="0" />
-        
-    <ccm_core.categorizations categorization_id="-30100" 
-                              category_id="-200" 
-                              object_id="-510" 
-                              category_order="1" 
-                              object_order="1" 
-                              category_index="false"
-                              type="folder" />
-    <ccm_core.categorizations categorization_id="-30200" 
-                              category_id="-200" 
-                              object_id="-520" 
-                              category_order="1" 
-                              object_order="2" 
-                              category_index="false"
-                              type="folder" />
-    <ccm_core.categorizations categorization_id="-30300"
-                              category_id="-300"
-                              object_id="-610"
-                              category_order="1"
-                              object_order="1"
-                              category_index="false"
-                              type="folder" />
-    <ccm_core.categorizations categorization_id="-30340"
-                              category_id="-300"
-                              object_id="-620"
-                              category_order="1"
-                              object_order="2"
-                              category_index="false"
-                              type="folder" />
-    <ccm_core.categorizations categorization_id="-30500"
-                              category_id="-300"
-                              object_id="-630"
-                              category_order="1"
-                              object_order="1"
-                              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="-510" />
-    <ccm_cms.attachment_lists list_id="-510020"
-                              name="list2"
-                              list_order="2"
-                              uuid="57850f9c-e191-4f6f-9537-d5c2d2f118ec"
-                              item_id="-510" />
-    <ccm_cms.attachment_lists list_id="-510030"
-                              name="list3"
-                              list_order="3"
-                              uuid="a0c2ba42-d506-48c0-b7cc-d32b2a031a50"
-                              item_id="-510" />
-    <ccm_cms.attachment_lists list_id="-520010"
-                              name="list1"
-                              list_order="1"
-                              uuid="7f954258-3ec9-4eee-bafe-5339ebf8b832"
-                              item_id="-520" />
-    <ccm_cms.attachment_lists list_id="-520020"
-                              name="list2"
-                              list_order="1"
-                              uuid="a6841869-6ebd-4a14-9c52-627cfc880f4e"
-                              item_id="-520" />
-    
-    <ccm_cms.attachment_lists_aud list_id="-510010" 
-                                  rev="0"
-                                  revtype="0"
-                                  name="list1"
-                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
-                                  item_id="-510" />
-    <ccm_cms.attachment_lists_aud list_id="-510020" 
-                                  rev="0"
-                                  revtype="0"
-                                  name="list2"
-                                  uuid="57850f9c-e191-4f6f-9537-d5c2d2f118ec"
-                                  itme_id="-510" />
-    <ccm_cms.attachment_lists_aud list_id="-510030" 
-                                  rev="0"
-                                  revtype="0"
-                                  name="list3"
-                                  uuid="a0c2ba42-d506-48c0-b7cc-d32b2a031a50"
-                                  item_id="-510" />
-    <ccm_cms.attachment_lists_aud list_id="-520010" 
-                                  rev="0"
-                                  revtype="0"
-                                  name="list1"
-                                  uuid="7f954258-3ec9-4eee-bafe-5339ebf8b832"
-                                  item_id="-520" />
-    <ccm_cms.attachment_lists_aud list_id="-520020" 
-                                  rev="0"
-                                  revtype="0"
-                                  name="list1"
-                                  uuid="a6841869-6ebd-4a14-9c52-627cfc880f4e"
-                                  item_id="-520" />
-    
-    <ccm_cms.attachments attachment_id="-510110"
-                         sort_key="1"
-                         uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
-                         asset_id="-710"
-                         attachment_list_id="-510010" />
-    <ccm_cms.attachments attachment_id="-510120"
-                         sort_key="2"
-                         uuid="5a34deae-9e3a-41e8-abd8-6a7d10dd9e7d"
-                         asset_id="-720"
-                         attachment_list_id="-510010" />
-    <ccm_cms.attachments attachment_id="-510130"
-                         sort_key="3"
-                         uuid="9e34627c-2da9-45fe-aae3-48801bd27cbe"
-                         asset_id="-610"
-                         attachment_list_id="-510010" />
-    <ccm_cms.attachments attachment_id="-510140"
-                         sort_key="1"
-                         uuid="6b5f86db-dd35-4674-a089-2a0b999a17c7"
-                         asset_id="-620"
-                         attachment_list_id="-510020" />
-    <ccm_cms.attachments attachment_id="-510150"
-                         sort_key="1"
-                         uuid="395c43dc-4aea-43e3-a2de-13e10f3a63f7"
-                         asset_id="-630"
-                         attachment_list_id="-510030" />
-    <ccm_cms.attachments attachment_id="-520110"
-                         sort_key="1"
-                         uuid="192d338b-8267-4566-a509-918d3323bf74"
-                         asset_id="-620"
-                         attachment_list_id="-520010" />
-    <ccm_cms.attachments attachment_id="-520120"
-                         sort_key="2"
-                         uuid="7cf32235-2794-457c-8436-e82bf1693382"
-                         asset_id="-630"
-                         attachment_list_id="-520010" />
-    <ccm_cms.attachments attachment_id="-520130"
-                         sort_key="1"
-                         uuid="324c95da-b44d-415e-b20a-612b94b9d604"
-                         asset_id="-730"
-                         attachment_list_id="-520020" />
-    <ccm_cms.attachments attachment_id="-520140"
-                         sort_key="2"
-                         uuid="d4b764cb-63d7-460f-87f8-f12032cab17c"
-                         asset_id="-610"
-                         attachment_list_id="-520020" />
-    
-    <ccm_cms.attachments_aud attachment_id="-510110"
-                             rev="0"
-                             revtype="0"
-                             sort_key="1"
-                             uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
-                             asset_id="-710"
-                             attachment_list_id="-510010" />
-    <ccm_cms.attachments_aud attachment_id="-510120"
-                             rev="0"
-                             revtype="0"
-                             sort_key="2"
-                             uuid="5a34deae-9e3a-41e8-abd8-6a7d10dd9e7d"
-                             asset_id="-720"
-                             attachment_list_id="-510010" />
-    <ccm_cms.attachments_aud attachment_id="-510130"
-                             rev="0"
-                             revtype="0"
-                             sort_key="3"
-                             uuid="9e34627c-2da9-45fe-aae3-48801bd27cbe"
-                             asset_id="-610"
-                             attachment_list_id="-510010" />
-    <ccm_cms.attachments_aud attachment_id="-510140"
-                             rev="0"
-                             revtype="0"
-                             sort_key="1"
-                             uuid="6b5f86db-dd35-4674-a089-2a0b999a17c7"
-                             asset_id="-620"
-                             attachment_list_id="-510020" />
-    <ccm_cms.attachments_aud attachment_id="-510150"
-                             rev="0"
-                             revtype="0"
-                             sort_key="1"
-                             uuid="395c43dc-4aea-43e3-a2de-13e10f3a63f7"
-                             asset_id="-630"
-                             attachment_list_id="-510030" />
-    <ccm_cms.attachments_aud attachment_id="-520110"
-                             rev="0"
-                             revtype="0"
-                             sort_key="1"
-                             uuid="192d338b-8267-4566-a509-918d3323bf74"
-                             asset_id="-620"
-                             attachment_list_id="-520010" />
-    <ccm_cms.attachments_aud attachment_id="-520120"
-                             rev="0"
-                             revtype="0"
-                             sort_key="2"
-                             uuid="7cf32235-2794-457c-8436-e82bf1693382"
-                             asset_id="-630"
-                             attachment_list_id="-520010" />
-    <ccm_cms.attachments_aud attachment_id="-520130"
-                             rev="0"
-                             revtype="0"
-                             sort_key="1"
-                             uuid="324c95da-b44d-415e-b20a-612b94b9d604"
-                             asset_id="-730"
-                             attachment_list_id="-520020" />
-    <ccm_cms.attachments_aud attachment_id="-520140"
-                             rev="0"
-                             revtype="0"
-                             sort_key="2"
-                             uuid="d4b764cb-63d7-460f-87f8-f12032cab17c"
-                             asset_id="-610"
-                             attachment_list_id="-520020" />
-    
-</dataset>

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

@@ -3,6 +3,8 @@
 
     <ccm_core.ccm_revisions id="0"
                             timestamp="1451602800" />
+    <ccm_core.ccm_revisions id="2"
+                            timestamp="1451602800" />
     
     <ccm_core.ccm_objects object_id="-100" 
                           display_name="info"
@@ -73,6 +75,10 @@
                               rev="0" 
                               revtype="0"
                               display_name="asset520-2a" />
+    <ccm_core.ccm_objects_aud object_id="-520"
+                              rev="2" 
+                              revtype="1"
+                              display_name="article1" />
     
     <ccm_core.categories object_id="-200" 
                          unique_id="82014239-9c06-486d-ae8c-4ae47f52a699" 
@@ -213,17 +219,17 @@
     <ccm_cms.asset_titles_aud asset_id="-710"
                               rev="0"
                               revtype="0" 
-                              localized_value="asset510-1a"
+                              localized_value="asset-510-1a"
                               locale="en" />
     <ccm_cms.asset_titles_aud asset_id="-720"
                               rev="0"
                               revtype="0" 
-                              localized_value="asset510-1b"
+                              localized_value="asset-510-1b"
                               locale="en" />
     <ccm_cms.asset_titles_aud asset_id="-730"
                               rev="0"
                               revtype="0" 
-                              localized_value="asset520-2a"
+                              localized_value="asset-520-2a"
                               locale="en" />
     
     <ccm_cms.binary_assets object_id="-610"
@@ -340,17 +346,17 @@
     
     <ccm_cms.attachment_lists list_id="-510010"
                               name="list1"
-                              list_order="1"
+                              list_order="0"
                               uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
                               item_id="-510" />
     <ccm_cms.attachment_lists list_id="-510020"
-                              name="list2"
+                              name="list1"
-                              list_order="2"
+                              list_order="1"
                               uuid="57850f9c-e191-4f6f-9537-d5c2d2f118ec"
                               item_id="-510" />
     <ccm_cms.attachment_lists list_id="-510030"
-                              name="list3"
+                              name="list2"
-                              list_order="3"
+                              list_order="2"
                               uuid="a0c2ba42-d506-48c0-b7cc-d32b2a031a50"
                               item_id="-510" />
     <ccm_cms.attachment_lists list_id="-520010"
@@ -363,37 +369,73 @@
                               list_order="1"
                               uuid="a6841869-6ebd-4a14-9c52-627cfc880f4e"
                               item_id="-520" />
-    
+    <ccm_cms.attachment_lists list_id="-520030"
-    <ccm_cms.attachment_lists_aud list_id="-510010" 
+                              name="newList"
-                                  rev="0"
+                              list_order="3"
-                                  revtype="0"
+                              uuid="00000000-0000-0000-0000-000000000000"
-                                  name="list1"
-                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
                               item_id="-510" />
-    <ccm_cms.attachment_lists_aud list_id="-510020" 
+    
+    <ccm_cms.attachment_lists_aud list_id="-520020" 
                                   rev="0"
                                   revtype="0"
                                   name="list2"
-                                  uuid="57850f9c-e191-4f6f-9537-d5c2d2f118ec"
+                                  uuid="a6841869-6ebd-4a14-9c52-627cfc880f4e"
-                                  itme_id="-510" />
+                                  item_id="-520" />
-    <ccm_cms.attachment_lists_aud list_id="-510030" 
-                                  rev="0"
-                                  revtype="0"
-                                  name="list3"
-                                  uuid="a0c2ba42-d506-48c0-b7cc-d32b2a031a50"
-                                  item_id="-510" />
     <ccm_cms.attachment_lists_aud list_id="-520010" 
                                   rev="0"
                                   revtype="0"
                                   name="list1"
                                   uuid="7f954258-3ec9-4eee-bafe-5339ebf8b832"
                                   item_id="-520" />
-    <ccm_cms.attachment_lists_aud list_id="-520020" 
+    <ccm_cms.attachment_lists_aud list_id="-510030" 
                                   rev="0"
+                                  revend="2"
+                                  revtype="0"
+                                  name="list2"
+                                  uuid="a0c2ba42-d506-48c0-b7cc-d32b2a031a50"
+                                  item_id="-510" />
+    <ccm_cms.attachment_lists_aud list_id="-510030" 
+                                  rev="2"
+                                  revtype="1"
+                                  name="list2"
+                                  list_order="2"
+                                  uuid="a0c2ba42-d506-48c0-b7cc-d32b2a031a50"
+                                  item_id="-510" />
+    <ccm_cms.attachment_lists_aud list_id="-510020" 
+                                  rev="0"
+                                  revend="2"
                                   revtype="0"
                                   name="list1"
-                                  uuid="a6841869-6ebd-4a14-9c52-627cfc880f4e"
+                                  uuid="57850f9c-e191-4f6f-9537-d5c2d2f118ec"
-                                  item_id="-520" />
+                                  item_id="-510" />
+    <ccm_cms.attachment_lists_aud list_id="-510020" 
+                                  rev="2"
+                                  revtype="1"
+                                  name="list1"
+                                  list_order="1"
+                                  uuid="57850f9c-e191-4f6f-9537-d5c2d2f118ec"
+                                  item_id="-510" />
+    <ccm_cms.attachment_lists_aud list_id="-510010" 
+                                  rev="0"
+                                  revend="2"
+                                  revtype="0"
+                                  name="list1"
+                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                                  item_id="-510" />
+    <ccm_cms.attachment_lists_aud list_id="-510010" 
+                                  rev="2"
+                                  revtype="1"
+                                  name="list1"
+                                  list_order="0"
+                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                                  item_id="-510" />
+    <ccm_cms.attachment_lists_aud list_id="-510040"
+                                  rev="2"
+                                  revtype="0" 
+                                  name="newList"
+                                  list_order="3"
+                                  uuid="00000000-0000-0000-0000-000000000000" 
+                                  item_id="-510" />
     
     <ccm_cms.attachments attachment_id="-510110"
                          sort_key="1"
@@ -506,3 +548,4 @@
                              attachment_list_id="-520020" />
     
 </dataset>
+

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AttachmentListManagerTest/after-create-with-negative-position.xml

@@ -3,6 +3,8 @@
 
     <ccm_core.ccm_revisions id="0"
                             timestamp="1451602800" />
+    <ccm_core.ccm_revisions id="2"
+                            timestamp="1451602800" />
     
     <ccm_core.ccm_objects object_id="-100" 
                           display_name="info"
@@ -73,6 +75,10 @@
                               rev="0" 
                               revtype="0"
                               display_name="asset520-2a" />
+    <ccm_core.ccm_objects_aud object_id="-520"
+                              rev="2" 
+                              revtype="1"
+                              display_name="article1" />
     
     <ccm_core.categories object_id="-200" 
                          unique_id="82014239-9c06-486d-ae8c-4ae47f52a699" 
@@ -213,17 +219,17 @@
     <ccm_cms.asset_titles_aud asset_id="-710"
                               rev="0"
                               revtype="0" 
-                              localized_value="asset510-1a"
+                              localized_value="asset-510-1a"
                               locale="en" />
     <ccm_cms.asset_titles_aud asset_id="-720"
                               rev="0"
                               revtype="0" 
-                              localized_value="asset510-1b"
+                              localized_value="asset-510-1b"
                               locale="en" />
     <ccm_cms.asset_titles_aud asset_id="-730"
                               rev="0"
                               revtype="0" 
-                              localized_value="asset520-2a"
+                              localized_value="asset-520-2a"
                               locale="en" />
     
     <ccm_cms.binary_assets object_id="-610"
@@ -344,12 +350,12 @@
                               uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
                               item_id="-510" />
     <ccm_cms.attachment_lists list_id="-510020"
-                              name="list2"
+                              name="list1"
                               list_order="2"
                               uuid="57850f9c-e191-4f6f-9537-d5c2d2f118ec"
                               item_id="-510" />
     <ccm_cms.attachment_lists list_id="-510030"
-                              name="list3"
+                              name="list2"
                               list_order="3"
                               uuid="a0c2ba42-d506-48c0-b7cc-d32b2a031a50"
                               item_id="-510" />
@@ -363,37 +369,49 @@
                               list_order="1"
                               uuid="a6841869-6ebd-4a14-9c52-627cfc880f4e"
                               item_id="-520" />
-    
+    <ccm_cms.attachment_lists list_id="-520030"
-    <ccm_cms.attachment_lists_aud list_id="-510010" 
+                              name="newList"
-                                  rev="0"
+                              list_order="0"
-                                  revtype="0"
+                              uuid="00000000-0000-0000-0000-000000000000"
-                                  name="list1"
-                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
                               item_id="-510" />
-    <ccm_cms.attachment_lists_aud list_id="-510020" 
+    
+    <ccm_cms.attachment_lists_aud list_id="-520020" 
                                   rev="0"
                                   revtype="0"
                                   name="list2"
-                                  uuid="57850f9c-e191-4f6f-9537-d5c2d2f118ec"
+                                  uuid="a6841869-6ebd-4a14-9c52-627cfc880f4e"
-                                  itme_id="-510" />
+                                  item_id="-520" />
-    <ccm_cms.attachment_lists_aud list_id="-510030" 
-                                  rev="0"
-                                  revtype="0"
-                                  name="list3"
-                                  uuid="a0c2ba42-d506-48c0-b7cc-d32b2a031a50"
-                                  item_id="-510" />
     <ccm_cms.attachment_lists_aud list_id="-520010" 
                                   rev="0"
                                   revtype="0"
                                   name="list1"
                                   uuid="7f954258-3ec9-4eee-bafe-5339ebf8b832"
                                   item_id="-520" />
-    <ccm_cms.attachment_lists_aud list_id="-520020" 
+    <ccm_cms.attachment_lists_aud list_id="-510030" 
+                                  rev="0"
+                                  revtype="0"
+                                  name="list2"
+                                  uuid="a0c2ba42-d506-48c0-b7cc-d32b2a031a50"
+                                  item_id="-510" />
+    <ccm_cms.attachment_lists_aud list_id="-510020" 
                                   rev="0"
                                   revtype="0"
                                   name="list1"
-                                  uuid="a6841869-6ebd-4a14-9c52-627cfc880f4e"
+                                  uuid="57850f9c-e191-4f6f-9537-d5c2d2f118ec"
-                                  item_id="-520" />
+                                  item_id="-510" />
+    <ccm_cms.attachment_lists_aud list_id="-510010" 
+                                  rev="0"
+                                  revtype="0"
+                                  name="list1"
+                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                                  item_id="-510" />
+    <ccm_cms.attachment_lists_aud list_id="-510040"
+                                  rev="2"
+                                  revtype="0" 
+                                  name="newList"
+                                  list_order="0"
+                                  uuid="00000000-0000-0000-0000-000000000000" 
+                                  item_id="-510" />
     
     <ccm_cms.attachments attachment_id="-510110"
                          sort_key="1"
@@ -506,3 +524,4 @@
                              attachment_list_id="-520020" />
     
 </dataset>
+

ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AttachmentListManagerTest/after-create-with-position.xml

@@ -3,6 +3,8 @@
 
     <ccm_core.ccm_revisions id="0"
                             timestamp="1451602800" />
+    <ccm_core.ccm_revisions id="2"
+                            timestamp="1451602800" />
     
     <ccm_core.ccm_objects object_id="-100" 
                           display_name="info"
@@ -73,6 +75,10 @@
                               rev="0" 
                               revtype="0"
                               display_name="asset520-2a" />
+    <ccm_core.ccm_objects_aud object_id="-520"
+                              rev="2" 
+                              revtype="1"
+                              display_name="article1" />
     
     <ccm_core.categories object_id="-200" 
                          unique_id="82014239-9c06-486d-ae8c-4ae47f52a699" 
@@ -213,17 +219,17 @@
     <ccm_cms.asset_titles_aud asset_id="-710"
                               rev="0"
                               revtype="0" 
-                              localized_value="asset510-1a"
+                              localized_value="asset-510-1a"
                               locale="en" />
     <ccm_cms.asset_titles_aud asset_id="-720"
                               rev="0"
                               revtype="0" 
-                              localized_value="asset510-1b"
+                              localized_value="asset-510-1b"
                               locale="en" />
     <ccm_cms.asset_titles_aud asset_id="-730"
                               rev="0"
                               revtype="0" 
-                              localized_value="asset520-2a"
+                              localized_value="asset-520-2a"
                               locale="en" />
     
     <ccm_cms.binary_assets object_id="-610"
@@ -340,16 +346,16 @@
     
     <ccm_cms.attachment_lists list_id="-510010"
                               name="list1"
-                              list_order="1"
+                              list_order="0"
                               uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
                               item_id="-510" />
     <ccm_cms.attachment_lists list_id="-510020"
-                              name="list2"
+                              name="list1"
                               list_order="2"
                               uuid="57850f9c-e191-4f6f-9537-d5c2d2f118ec"
                               item_id="-510" />
     <ccm_cms.attachment_lists list_id="-510030"
-                              name="list3"
+                              name="list2"
                               list_order="3"
                               uuid="a0c2ba42-d506-48c0-b7cc-d32b2a031a50"
                               item_id="-510" />
@@ -363,37 +369,57 @@
                               list_order="1"
                               uuid="a6841869-6ebd-4a14-9c52-627cfc880f4e"
                               item_id="-520" />
-    
+    <ccm_cms.attachment_lists list_id="-520030"
-    <ccm_cms.attachment_lists_aud list_id="-510010" 
+                              name="newList"
-                                  rev="0"
+                              list_order="1"
-                                  revtype="0"
+                              uuid="00000000-0000-0000-0000-000000000000"
-                                  name="list1"
-                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
                               item_id="-510" />
-    <ccm_cms.attachment_lists_aud list_id="-510020" 
+    
+    <ccm_cms.attachment_lists_aud list_id="-520020" 
                                   rev="0"
                                   revtype="0"
                                   name="list2"
-                                  uuid="57850f9c-e191-4f6f-9537-d5c2d2f118ec"
+                                  uuid="a6841869-6ebd-4a14-9c52-627cfc880f4e"
-                                  itme_id="-510" />
+                                  item_id="-520" />
-    <ccm_cms.attachment_lists_aud list_id="-510030" 
-                                  rev="0"
-                                  revtype="0"
-                                  name="list3"
-                                  uuid="a0c2ba42-d506-48c0-b7cc-d32b2a031a50"
-                                  item_id="-510" />
     <ccm_cms.attachment_lists_aud list_id="-520010" 
                                   rev="0"
                                   revtype="0"
                                   name="list1"
                                   uuid="7f954258-3ec9-4eee-bafe-5339ebf8b832"
                                   item_id="-520" />
-    <ccm_cms.attachment_lists_aud list_id="-520020" 
+    <ccm_cms.attachment_lists_aud list_id="-510030" 
+                                  rev="0"
+                                  revtype="0"
+                                  name="list2"
+                                  uuid="a0c2ba42-d506-48c0-b7cc-d32b2a031a50"
+                                  item_id="-510" />
+    <ccm_cms.attachment_lists_aud list_id="-510020" 
                                   rev="0"
                                   revtype="0"
                                   name="list1"
-                                  uuid="a6841869-6ebd-4a14-9c52-627cfc880f4e"
+                                  uuid="57850f9c-e191-4f6f-9537-d5c2d2f118ec"
-                                  item_id="-520" />
+                                  item_id="-510" />
+    <ccm_cms.attachment_lists_aud list_id="-510010" 
+                                  rev="0"
+                                  revend="2"
+                                  revtype="0"
+                                  name="list1"
+                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                                  item_id="-510" />
+    <ccm_cms.attachment_lists_aud list_id="-510010" 
+                                  rev="2"
+                                  revtype="1"
+                                  name="list1"
+                                  list_order="0"
+                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                                  item_id="-510" />
+    <ccm_cms.attachment_lists_aud list_id="-510040"
+                                  rev="2"
+                                  revtype="0" 
+                                  name="newList"
+                                  list_order="1"
+                                  uuid="00000000-0000-0000-0000-000000000000" 
+                                  item_id="-510" />
     
     <ccm_cms.attachments attachment_id="-510110"
                          sort_key="1"
@@ -506,3 +532,4 @@
                              attachment_list_id="-520020" />
     
 </dataset>
+

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

@@ -3,7 +3,7 @@
 
     <ccm_core.ccm_revisions id="0"
                             timestamp="1451602800" />
-    <ccm_core.ccm_revisions id="1"
+    <ccm_core.ccm_revisions id="2"
                             timestamp="1451602800" />
     
     <ccm_core.ccm_objects object_id="-100" 
@@ -75,6 +75,10 @@
                               rev="0" 
                               revtype="0"
                               display_name="asset520-2a" />
+    <ccm_core.ccm_objects_aud object_id="-520"
+                              rev="2" 
+                              revtype="1"
+                              display_name="article2" />
     
     <ccm_core.categories object_id="-200" 
                          unique_id="82014239-9c06-486d-ae8c-4ae47f52a699" 
@@ -215,17 +219,17 @@
     <ccm_cms.asset_titles_aud asset_id="-710"
                               rev="0"
                               revtype="0" 
-                              localized_value="asset510-1a"
+                              localized_value="asset-510-1a"
                               locale="en" />
     <ccm_cms.asset_titles_aud asset_id="-720"
                               rev="0"
                               revtype="0" 
-                              localized_value="asset510-1b"
+                              localized_value="asset-510-1b"
                               locale="en" />
     <ccm_cms.asset_titles_aud asset_id="-730"
                               rev="0"
                               revtype="0" 
-                              localized_value="asset520-2a"
+                              localized_value="asset-520-2a"
                               locale="en" />
     
     <ccm_cms.binary_assets object_id="-610"
@@ -357,7 +361,7 @@
                               item_id="-510" />
     <ccm_cms.attachment_lists list_id="-520010"
                               name="list1"
-                              list_order="1"
+                              list_order="0"
                               uuid="7f954258-3ec9-4eee-bafe-5339ebf8b832"
                               item_id="-520" />
     <ccm_cms.attachment_lists list_id="-520020"
@@ -371,11 +375,32 @@
                               uuid="00000000-0000-0000-0000-000000000000"
                               item_id="-520" />
     
-    <ccm_cms.attachment_lists_aud list_id="-510010" 
+    
+    <ccm_cms.attachment_lists_aud list_id="-520020" 
                                   rev="0"
                                   revtype="0"
+                                  name="list2"
+                                  uuid="a6841869-6ebd-4a14-9c52-627cfc880f4e"
+                                  item_id="-520" />
+    <ccm_cms.attachment_lists_aud list_id="-520010" 
+                                  rev="0"
+                                  revend="2"
+                                  revtype="0"
                                   name="list1"
-                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                                  uuid="7f954258-3ec9-4eee-bafe-5339ebf8b832"
+                                  item_id="-520" />
+    <ccm_cms.attachment_lists_aud list_id="-520010" 
+                                  rev="2"
+                                  revtype="1"
+                                  name="list1"
+                                  list_order="0"
+                                  uuid="7f954258-3ec9-4eee-bafe-5339ebf8b832"
+                                  item_id="-520" />
+    <ccm_cms.attachment_lists_aud list_id="-510030" 
+                                  rev="0"
+                                  revtype="0"
+                                  name="list2"
+                                  uuid="a0c2ba42-d506-48c0-b7cc-d32b2a031a50"
                                   item_id="-510" />
     <ccm_cms.attachment_lists_aud list_id="-510020" 
                                   rev="0"
@@ -383,23 +408,18 @@
                                   name="list1"
                                   uuid="57850f9c-e191-4f6f-9537-d5c2d2f118ec"
                                   item_id="-510" />
-    <ccm_cms.attachment_lists_aud list_id="-510030" 
+    <ccm_cms.attachment_lists_aud list_id="-510010" 
-                                  rev="0"
-                                  revtype="0"
-                                  name="list2"
-                                  uuid="a0c2ba42-d506-48c0-b7cc-d32b2a031a50"
-                                  item_id="-510" />
-    <ccm_cms.attachment_lists_aud list_id="-520010" 
                                   rev="0"
                                   revtype="0"
                                   name="list1"
-                                  uuid="7f954258-3ec9-4eee-bafe-5339ebf8b832"
+                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
-                                  item_id="-520" />
+                                  item_id="-510" />
-    <ccm_cms.attachment_lists_aud list_id="-520020" 
+    <ccm_cms.attachment_lists_aud list_id="-520030"
-                                  rev="0"
+                                  rev="2"
                                   revtype="0" 
-                                  name="list2"
+                                  name="newList"
-                                  uuid="a6841869-6ebd-4a14-9c52-627cfc880f4e"
+                                  list_order="2"
+                                  uuid="00000000-0000-0000-0000-000000000000" 
                                   item_id="-520" />
     
     <ccm_cms.attachments attachment_id="-510110"

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

@@ -3,6 +3,8 @@
 
     <ccm_core.ccm_revisions id="0"
                             timestamp="1451602800" />
+    <ccm_core.ccm_revisions id="1"
+                            timestamp="1451602800" />
     
     <ccm_core.ccm_objects object_id="-100" 
                           display_name="info"
@@ -213,17 +215,17 @@
     <ccm_cms.asset_titles_aud asset_id="-710"
                               rev="0"
                               revtype="0" 
-                              localized_value="asset510-1a"
+                              localized_value="asset-510-1a"
                               locale="en" />
     <ccm_cms.asset_titles_aud asset_id="-720"
                               rev="0"
                               revtype="0" 
-                              localized_value="asset510-1b"
+                              localized_value="asset-510-1b"
                               locale="en" />
     <ccm_cms.asset_titles_aud asset_id="-730"
                               rev="0"
                               revtype="0" 
-                              localized_value="asset520-2a"
+                              localized_value="asset-520-2a"
                               locale="en" />
     
     <ccm_cms.binary_assets object_id="-610"
@@ -344,13 +346,13 @@
                               uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
                               item_id="-510" />
     <ccm_cms.attachment_lists list_id="-510020"
-                              name="list2"
+                              name="list1"
-                              list_order="2"
+                              list_order="3"
                               uuid="57850f9c-e191-4f6f-9537-d5c2d2f118ec"
                               item_id="-510" />
     <ccm_cms.attachment_lists list_id="-510030"
-                              name="list3"
+                              name="list2"
-                              list_order="3"
+                              list_order="2"
                               uuid="a0c2ba42-d506-48c0-b7cc-d32b2a031a50"
                               item_id="-510" />
     <ccm_cms.attachment_lists list_id="-520010"
@@ -373,13 +375,15 @@
     <ccm_cms.attachment_lists_aud list_id="-510020" 
                                   rev="0"
                                   revtype="0"
-                                  name="list2"
+                                  revend="1"
+                                  name="list1"
                                   uuid="57850f9c-e191-4f6f-9537-d5c2d2f118ec"
-                                  itme_id="-510" />
+                                  item_id="-510" />
     <ccm_cms.attachment_lists_aud list_id="-510030" 
                                   rev="0"
                                   revtype="0"
-                                  name="list3"
+                                  revend="1"
+                                  name="list2"
                                   uuid="a0c2ba42-d506-48c0-b7cc-d32b2a031a50"
                                   item_id="-510" />
     <ccm_cms.attachment_lists_aud list_id="-520010" 
@@ -391,9 +395,23 @@
     <ccm_cms.attachment_lists_aud list_id="-520020" 
                                   rev="0"
                                   revtype="0"
-                                  name="list1"
+                                  name="list2"
                                   uuid="a6841869-6ebd-4a14-9c52-627cfc880f4e"
                                   item_id="-520" />
+    <ccm_cms.attachment_lists_aud list_id="-510020" 
+                                  rev="1"
+                                  revtype="1"
+                                  name="list1"
+                                  list_order="3"
+                                  uuid="57850f9c-e191-4f6f-9537-d5c2d2f118ec"
+                                  item_id="-510" />
+    <ccm_cms.attachment_lists_aud list_id="-510030" 
+                                  rev="1"
+                                  revtype="1"
+                                  name="list2"
+                                  list_order="2"
+                                  uuid="a0c2ba42-d506-48c0-b7cc-d32b2a031a50"
+                                  item_id="-510" />
     
     <ccm_cms.attachments attachment_id="-510110"
                          sort_key="1"

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

@@ -3,6 +3,8 @@
 
     <ccm_core.ccm_revisions id="0"
                             timestamp="1451602800" />
+    <ccm_core.ccm_revisions id="1"
+                            timestamp="1451602800" />
     
     <ccm_core.ccm_objects object_id="-100" 
                           display_name="info"
@@ -213,17 +215,17 @@
     <ccm_cms.asset_titles_aud asset_id="-710"
                               rev="0"
                               revtype="0" 
-                              localized_value="asset510-1a"
+                              localized_value="asset-510-1a"
                               locale="en" />
     <ccm_cms.asset_titles_aud asset_id="-720"
                               rev="0"
                               revtype="0" 
-                              localized_value="asset510-1b"
+                              localized_value="asset-510-1b"
                               locale="en" />
     <ccm_cms.asset_titles_aud asset_id="-730"
                               rev="0"
                               revtype="0" 
-                              localized_value="asset520-2a"
+                              localized_value="asset-520-2a"
                               locale="en" />
     
     <ccm_cms.binary_assets object_id="-610"
@@ -340,16 +342,16 @@
     
     <ccm_cms.attachment_lists list_id="-510010"
                               name="list1"
-                              list_order="1"
+                              list_order="2"
                               uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
                               item_id="-510" />
     <ccm_cms.attachment_lists list_id="-510020"
-                              name="list2"
+                              name="list1"
-                              list_order="2"
+                              list_order="1"
                               uuid="57850f9c-e191-4f6f-9537-d5c2d2f118ec"
                               item_id="-510" />
     <ccm_cms.attachment_lists list_id="-510030"
-                              name="list3"
+                              name="list2"
                               list_order="3"
                               uuid="a0c2ba42-d506-48c0-b7cc-d32b2a031a50"
                               item_id="-510" />
@@ -367,19 +369,21 @@
     <ccm_cms.attachment_lists_aud list_id="-510010" 
                                   rev="0"
                                   revtype="0"
+                                  revend="1"
                                   name="list1"
                                   uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
                                   item_id="-510" />
     <ccm_cms.attachment_lists_aud list_id="-510020" 
                                   rev="0"
                                   revtype="0"
-                                  name="list2"
+                                  revend="1"
+                                  name="list1"
                                   uuid="57850f9c-e191-4f6f-9537-d5c2d2f118ec"
-                                  itme_id="-510" />
+                                  item_id="-510" />
     <ccm_cms.attachment_lists_aud list_id="-510030" 
                                   rev="0"
                                   revtype="0"
-                                  name="list3"
+                                  name="list2"
                                   uuid="a0c2ba42-d506-48c0-b7cc-d32b2a031a50"
                                   item_id="-510" />
     <ccm_cms.attachment_lists_aud list_id="-520010" 
@@ -391,9 +395,23 @@
     <ccm_cms.attachment_lists_aud list_id="-520020" 
                                   rev="0"
                                   revtype="0"
-                                  name="list1"
+                                  name="list2"
                                   uuid="a6841869-6ebd-4a14-9c52-627cfc880f4e"
                                   item_id="-520" />
+    <ccm_cms.attachment_lists_aud list_id="-510010" 
+                                  rev="1"
+                                  revtype="1"
+                                  name="list1"
+                                  list_order="2"
+                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                                  item_id="-510" />
+    <ccm_cms.attachment_lists_aud list_id="-510020" 
+                                  rev="1"
+                                  revtype="1"
+                                  name="list1"
+                                  list_order="1"
+                                  uuid="57850f9c-e191-4f6f-9537-d5c2d2f118ec"
+                                  item_id="-510" />
     
     <ccm_cms.attachments attachment_id="-510110"
                          sort_key="1"

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

@@ -3,6 +3,8 @@
 
     <ccm_core.ccm_revisions id="0"
                             timestamp="1451602800" />
+    <ccm_core.ccm_revisions id="1"
+                            timestamp="1451602800" />
     
     <ccm_core.ccm_objects object_id="-100" 
                           display_name="info"
@@ -31,18 +33,13 @@
     <ccm_core.ccm_objects object_id="-630"
                           display_name="sharedAsset3"
                           uuid="2f66baca-7e5a-4556-a4c5-f9285d71293d" />
-    <ccm_core.ccm_objects object_id="-710"
-                          display_name="asset510-1a"
-                          uuid="cdc1bea7-7d3e-4019-a73c-d00e41efc9d0" />
-    <ccm_core.ccm_objects object_id="-720"
-                          display_name="asset510-1b"
-                          uuid="71479eae-28bd-446e-82a9-21581192d298" />
     <ccm_core.ccm_objects object_id="-730"
                           display_name="asset520-2a"
                           uuid="1b8e879e-cf79-4c1d-a732-56b4053ec311" />
     
     <ccm_core.ccm_objects_aud object_id="-510"
                               rev="0"
+                              revend="1"
                               revtype="0"
                               display_name="article1" />
     <ccm_core.ccm_objects_aud object_id="-520"
@@ -51,6 +48,7 @@
                               display_name="article2" />
     <ccm_core.ccm_objects_aud object_id="-610"
                               rev="0" 
+                              revend="1"
                               revtype="0"
                               display_name="sharedAsset1" />
     <ccm_core.ccm_objects_aud object_id="-620"
@@ -63,16 +61,32 @@
                               display_name="sharedAsset3" />
     <ccm_core.ccm_objects_aud object_id="-710"
                               rev="0" 
+                              revend="1"
                               revtype="0"
                               display_name="asset510-1a" />
     <ccm_core.ccm_objects_aud object_id="-720"
                               rev="0" 
+                              revend="1"
                               revtype="0"
                               display_name="asset510-1b" />
     <ccm_core.ccm_objects_aud object_id="-730"
                               rev="0" 
                               revtype="0"
                               display_name="asset520-2a" />
+    <ccm_core.ccm_objects_aud object_id="-510"
+                              rev="1"
+                              revtype="1"
+                              display_name="article1" />
+    <ccm_core.ccm_objects_aud object_id="-610"
+                              rev="1" 
+                              revtype="1"
+                              display_name="sharedAsset1" />
+    <ccm_core.ccm_objects_aud object_id="-710"
+                              rev="1" 
+                              revtype="2" />
+    <ccm_core.ccm_objects_aud object_id="-720"
+                              rev="1" 
+                              revtype="2" />
     
     <ccm_core.categories object_id="-200" 
                          unique_id="82014239-9c06-486d-ae8c-4ae47f52a699" 
@@ -159,20 +173,24 @@
     <ccm_cms.assets object_id="-610" />
     <ccm_cms.assets object_id="-620" />
     <ccm_cms.assets object_id="-630" />
-    <ccm_cms.assets object_id="-710" />
-    <ccm_cms.assets object_id="-720" />
     <ccm_cms.assets object_id="-730" />
     
     <ccm_cms.assets_aud object_id="-610"
                         rev="0" />
+    <ccm_cms.assets_aud object_id="-610"
+                        rev="1" />
     <ccm_cms.assets_aud object_id="-620"
                         rev="0" />
     <ccm_cms.assets_aud object_id="-630"
                         rev="0" />
     <ccm_cms.assets_aud object_id="-710"
                         rev="0" />
+    <ccm_cms.assets_aud object_id="-710"
+                        rev="1" />
     <ccm_cms.assets_aud object_id="-720"
                         rev="0" />
+    <ccm_cms.assets_aud object_id="-720"
+                        rev="1" />
     <ccm_cms.assets_aud object_id="-730"
                         rev="0" />
     
@@ -185,12 +203,6 @@
     <ccm_cms.asset_titles asset_id="-630"
                           localized_value="sharedAsset3"
                           locale="en" />
-    <ccm_cms.asset_titles asset_id="-710"
-                          localized_value="asset-510-1a"
-                          locale="en" />
-    <ccm_cms.asset_titles asset_id="-720"
-                          localized_value="asset-510-1b"
-                          locale="en" />
     <ccm_cms.asset_titles asset_id="-730"
                           localized_value="asset-520-2a"
                           locale="en" />
@@ -212,18 +224,30 @@
                               locale="en" />
     <ccm_cms.asset_titles_aud asset_id="-710"
                               rev="0"
+                              revend="1"
                               revtype="0" 
-                              localized_value="asset510-1a"
+                              localized_value="asset-510-1a"
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-710"
+                              rev="1"
+                              revtype="2" 
+                              localized_value="asset-510-1a"
                               locale="en"/>
     <ccm_cms.asset_titles_aud asset_id="-720"
                               rev="0"
+                              revend="1"
                               revtype="0" 
-                              localized_value="asset510-1b"
+                              localized_value="asset-510-1b"
+                              locale="en" />
+    <ccm_cms.asset_titles_aud asset_id="-720"
+                              rev="1"
+                              revtype="2"
+                              localized_value="asset-510-1b"
                               locale="en" />
     <ccm_cms.asset_titles_aud asset_id="-730"
                               rev="0"
                               revtype="0" 
-                              localized_value="asset520-2a"
+                              localized_value="asset-520-2a"
                               locale="en" />
     
     <ccm_cms.binary_assets object_id="-610"
@@ -238,14 +262,6 @@
                            filename="shared-asset-3.pdf"
                            mime_type="application/pdf"
                            data_size="0" />
-    <ccm_cms.binary_assets object_id="-710"
-                           filename="asset-510-1a.pdf"
-                           mime_type="application/pdf"
-                           data_size="0" />
-    <ccm_cms.binary_assets object_id="-720"
-                           filename="asset-510-1b.pdf"
-                           mime_type="application/pdf"
-                           data_size="0" />
     <ccm_cms.binary_assets object_id="-730"
                            filename="asset-520-2a.pdf"
                            mime_type="application/pdf"
@@ -256,6 +272,11 @@
                                filename="shared-asset-1.pdf"
                                mime_type="application/pdf"
                                data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-610"
+                               rev="1" 
+                               filename="shared-asset-1.pdf"
+                               mime_type="application/pdf"
+                               data_size="0"/>
     <ccm_cms.binary_assets_aud object_id="-620"
                                rev="0"
                                filename="shared-asset-2.pdf"
@@ -271,11 +292,15 @@
                                filename="asset-510-1a.pdf"
                                mime_type="application/pdf"
                                data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-710"
+                               rev="1" />
     <ccm_cms.binary_assets_aud object_id="-720"
                                rev="0"
                                filename="asset-510-1b.pdf"
                                mime_type="application/pdf"
                                data_size="0" />
+    <ccm_cms.binary_assets_aud object_id="-720"
+                               rev="1" />
     <ccm_cms.binary_assets_aud object_id="-730"
                                rev="0"
                                filename="asset-520-2a.pdf"
@@ -285,20 +310,24 @@
     <ccm_cms.files object_id="-610" />
     <ccm_cms.files object_id="-620" />
     <ccm_cms.files object_id="-630" />
-    <ccm_cms.files object_id="-710" />
-    <ccm_cms.files object_id="-720" />
     <ccm_cms.files object_id="-730" />
     
     <ccm_cms.files_aud object_id="-610" 
                        rev="0" />
+    <ccm_cms.files_aud object_id="-610" 
+                       rev="1" />
     <ccm_cms.files_aud object_id="-620" 
                        rev="0" />
     <ccm_cms.files_aud object_id="-630" 
                        rev="0" />
     <ccm_cms.files_aud object_id="-710" 
                        rev="0" />
+    <ccm_cms.files_aud object_id="-710" 
+                       rev="1" />
     <ccm_cms.files_aud object_id="-720" 
                        rev="0" />
+    <ccm_cms.files_aud object_id="-720" 
+                       rev="1" />
     <ccm_cms.files_aud object_id="-730" 
                        rev="0" />
         
@@ -338,18 +367,13 @@
                               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="-510" />
     <ccm_cms.attachment_lists list_id="-510020"
-                              name="list2"
+                              name="list1"
                               list_order="2"
                               uuid="57850f9c-e191-4f6f-9537-d5c2d2f118ec"
                               item_id="-510" />
     <ccm_cms.attachment_lists list_id="-510030"
-                              name="list3"
+                              name="list2"
                               list_order="3"
                               uuid="a0c2ba42-d506-48c0-b7cc-d32b2a031a50"
                               item_id="-510" />
@@ -364,52 +388,41 @@
                               uuid="a6841869-6ebd-4a14-9c52-627cfc880f4e"
                               item_id="-520" />
     
-    <ccm_cms.attachment_lists_aud list_id="-510010" 
+    <ccm_cms.attachment_lists_aud list_id="-520020" 
-                                  rev="0"
-                                  revtype="0"
-                                  name="list1"
-                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
-                                  item_id="-510" />
-    <ccm_cms.attachment_lists_aud list_id="-510020" 
                                   rev="0"
                                   revtype="0"
                                   name="list2"
-                                  uuid="57850f9c-e191-4f6f-9537-d5c2d2f118ec"
+                                  uuid="a6841869-6ebd-4a14-9c52-627cfc880f4e"
-                                  itme_id="-510" />
+                                  item_id="-520" />
-    <ccm_cms.attachment_lists_aud list_id="-510030" 
-                                  rev="0"
-                                  revtype="0"
-                                  name="list3"
-                                  uuid="a0c2ba42-d506-48c0-b7cc-d32b2a031a50"
-                                  item_id="-510" />
     <ccm_cms.attachment_lists_aud list_id="-520010" 
                                   rev="0"
                                   revtype="0"
                                   name="list1"
                                   uuid="7f954258-3ec9-4eee-bafe-5339ebf8b832"
                                   item_id="-520" />
-    <ccm_cms.attachment_lists_aud list_id="-520020" 
+    <ccm_cms.attachment_lists_aud list_id="-510030" 
+                                  rev="0"
+                                  revtype="0"
+                                  name="list2"
+                                  uuid="a0c2ba42-d506-48c0-b7cc-d32b2a031a50"
+                                  item_id="-510" />
+    <ccm_cms.attachment_lists_aud list_id="-510020" 
                                   rev="0"
                                   revtype="0"
                                   name="list1"
-                                  uuid="a6841869-6ebd-4a14-9c52-627cfc880f4e"
+                                  uuid="57850f9c-e191-4f6f-9537-d5c2d2f118ec"
-                                  item_id="-520" />
+                                  item_id="-510" />
+    <ccm_cms.attachment_lists_aud list_id="-510010" 
+                                  rev="0"
+                                  revend="1"
+                                  revtype="0"
+                                  name="list1"
+                                  uuid="209e3f76-1523-4601-84bd-dbae91f4f26d"
+                                  item_id="-510" />
+    <ccm_cms.attachment_lists_aud list_id="-510010" 
+                                  rev="1"
+                                  revtype="2" />
     
-    <ccm_cms.attachments attachment_id="-510110"
-                         sort_key="1"
-                         uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
-                         asset_id="-710"
-                         attachment_list_id="-510010" />
-    <ccm_cms.attachments attachment_id="-510120"
-                         sort_key="2"
-                         uuid="5a34deae-9e3a-41e8-abd8-6a7d10dd9e7d"
-                         asset_id="-720"
-                         attachment_list_id="-510010" />
-    <ccm_cms.attachments attachment_id="-510130"
-                         sort_key="3"
-                         uuid="9e34627c-2da9-45fe-aae3-48801bd27cbe"
-                         asset_id="-610"
-                         attachment_list_id="-510010" />
     <ccm_cms.attachments attachment_id="-510140"
                          sort_key="1"
                          uuid="6b5f86db-dd35-4674-a089-2a0b999a17c7"
@@ -441,62 +454,6 @@
                          asset_id="-610"
                          attachment_list_id="-520020" />
     
-    <ccm_cms.attachments_aud attachment_id="-510110"
-                             rev="0"
-                             revtype="0"
-                             sort_key="1"
-                             uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
-                             asset_id="-710"
-                             attachment_list_id="-510010" />
-    <ccm_cms.attachments_aud attachment_id="-510120"
-                             rev="0"
-                             revtype="0"
-                             sort_key="2"
-                             uuid="5a34deae-9e3a-41e8-abd8-6a7d10dd9e7d"
-                             asset_id="-720"
-                             attachment_list_id="-510010" />
-    <ccm_cms.attachments_aud attachment_id="-510130"
-                             rev="0"
-                             revtype="0"
-                             sort_key="3"
-                             uuid="9e34627c-2da9-45fe-aae3-48801bd27cbe"
-                             asset_id="-610"
-                             attachment_list_id="-510010" />
-    <ccm_cms.attachments_aud attachment_id="-510140"
-                             rev="0"
-                             revtype="0"
-                             sort_key="1"
-                             uuid="6b5f86db-dd35-4674-a089-2a0b999a17c7"
-                             asset_id="-620"
-                             attachment_list_id="-510020" />
-    <ccm_cms.attachments_aud attachment_id="-510150"
-                             rev="0"
-                             revtype="0"
-                             sort_key="1"
-                             uuid="395c43dc-4aea-43e3-a2de-13e10f3a63f7"
-                             asset_id="-630"
-                             attachment_list_id="-510030" />
-    <ccm_cms.attachments_aud attachment_id="-520110"
-                             rev="0"
-                             revtype="0"
-                             sort_key="1"
-                             uuid="192d338b-8267-4566-a509-918d3323bf74"
-                             asset_id="-620"
-                             attachment_list_id="-520010" />
-    <ccm_cms.attachments_aud attachment_id="-520120"
-                             rev="0"
-                             revtype="0"
-                             sort_key="2"
-                             uuid="7cf32235-2794-457c-8436-e82bf1693382"
-                             asset_id="-630"
-                             attachment_list_id="-520010" />
-    <ccm_cms.attachments_aud attachment_id="-520130"
-                             rev="0"
-                             revtype="0"
-                             sort_key="1"
-                             uuid="324c95da-b44d-415e-b20a-612b94b9d604"
-                             asset_id="-730"
-                             attachment_list_id="-520020" />
     <ccm_cms.attachments_aud attachment_id="-520140"
                              rev="0"
                              revtype="0"
@@ -504,5 +461,73 @@
                              uuid="d4b764cb-63d7-460f-87f8-f12032cab17c"
                              asset_id="-610"
                              attachment_list_id="-520020" />
+    <ccm_cms.attachments_aud attachment_id="-520130"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="324c95da-b44d-415e-b20a-612b94b9d604"
+                             asset_id="-730"
+                             attachment_list_id="-520020" />
+    <ccm_cms.attachments_aud attachment_id="-520120"
+                             rev="0"
+                             revtype="0"
+                             sort_key="2"
+                             uuid="7cf32235-2794-457c-8436-e82bf1693382"
+                             asset_id="-630"
+                             attachment_list_id="-520010" />
+    <ccm_cms.attachments_aud attachment_id="-520110"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="192d338b-8267-4566-a509-918d3323bf74"
+                             asset_id="-620"
+                             attachment_list_id="-520010" />
+    <ccm_cms.attachments_aud attachment_id="-510150"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="395c43dc-4aea-43e3-a2de-13e10f3a63f7"
+                             asset_id="-630"
+                             attachment_list_id="-510030" />
+    <ccm_cms.attachments_aud attachment_id="-510140"
+                             rev="0"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="6b5f86db-dd35-4674-a089-2a0b999a17c7"
+                             asset_id="-620"
+                             attachment_list_id="-510020" />
+    <ccm_cms.attachments_aud attachment_id="-510130"
+                             rev="0"
+                             revtype="0"
+                             revend="1"
+                             sort_key="3"
+                             uuid="9e34627c-2da9-45fe-aae3-48801bd27cbe"
+                             asset_id="-610"
+                             attachment_list_id="-510010" />
+    <ccm_cms.attachments_aud attachment_id="-510130"
+                             rev="1"
+                             revtype="2" />
+    <ccm_cms.attachments_aud attachment_id="-510120"
+                             rev="0"
+                             revend="1"
+                             revtype="0"
+                             sort_key="2"
+                             uuid="5a34deae-9e3a-41e8-abd8-6a7d10dd9e7d"
+                             asset_id="-720"
+                             attachment_list_id="-510010" />
+    <ccm_cms.attachments_aud attachment_id="-510120"
+                             rev="1"
+                             revtype="2" />
+    <ccm_cms.attachments_aud attachment_id="-510110"
+                             rev="0"
+                             revend="1"
+                             revtype="0"
+                             sort_key="1"
+                             uuid="de1d8531-df11-4808-9679-9ffa7537ebd1"
+                             asset_id="-710"
+                             attachment_list_id="-510010" />
+    <ccm_cms.attachments_aud attachment_id="-510110"
+                             rev="1"
+                             revtype="2" />
     
 </dataset>

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

@@ -213,17 +213,17 @@
     <ccm_cms.asset_titles_aud asset_id="-710"
                               rev="0"
                               revtype="0" 
-                              localized_value="asset510-1a"
+                              localized_value="asset-510-1a"
                               locale="en" />
     <ccm_cms.asset_titles_aud asset_id="-720"
                               rev="0"
                               revtype="0" 
-                              localized_value="asset510-1b"
+                              localized_value="asset-510-1b"
                               locale="en" />
     <ccm_cms.asset_titles_aud asset_id="-730"
                               rev="0"
                               revtype="0" 
-                              localized_value="asset520-2a"
+                              localized_value="asset-520-2a"
                               locale="en" />
     
     <ccm_cms.binary_assets object_id="-610"

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

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