CCM NG/ccm-cms: Created a subclass of Category for Folders. Started to add add Repository and Manager classes and to refactor all classes to use Folder instead of plain category for folders.

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

ccm-cms/src/main/java/com/arsdigita/cms/ui/folder/ItemPath.java

@@ -24,10 +24,12 @@ import com.arsdigita.bebop.list.ListModel;
 import com.arsdigita.bebop.list.ListModelBuilder;
 import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.util.LockableImpl;
+
 import org.libreccm.categorization.Category;
 import org.libreccm.cdi.utils.CdiUtil;
 import org.librecms.contentsection.ContentItem;
 import org.librecms.contentsection.ContentItemManager;
+import org.librecms.contentsection.Folder;
 
 /**
  * Produce a list of the items starting from the selected item's root down to
@@ -46,7 +48,7 @@ public class ItemPath extends List {
 
     public static class ItemPathListModel implements ListModel {
 
-        private final java.util.List<Category> pathFolders;
+        private final java.util.List<Folder> pathFolders;
         private int index = -1;
 
         public ItemPathListModel(final ContentItem item) {

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

@@ -42,6 +42,8 @@ import org.libreccm.categorization.CategoryManager;
 import org.libreccm.categorization.ObjectNotAssignedToCategoryException;
 import org.libreccm.configuration.ConfigurationManager;
 import org.libreccm.l10n.LocalizedString;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
 import org.libreccm.workflow.Workflow;
 import org.libreccm.workflow.WorkflowManager;
 import org.librecms.CmsConstants;
@@ -112,11 +114,13 @@ public class ContentItemManager {
      *
      * @return The new content item.
      */
+    @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public <T extends ContentItem> T createContentItem(
         final String name,
         final ContentSection section,
-        final Category folder,
+        @RequiresPrivilege(CmsConstants.PRIVILEGE_ITEMS_CREATE_NEW)
+        final Folder folder,
         final Class<T> type) {
 
         final Optional<ContentType> contentType = typeRepo
@@ -159,11 +163,13 @@ public class ContentItemManager {
      *
      * @return The new content item.
      */
+    @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
     public <T extends ContentItem> T createContentItem(
         final String name,
         final ContentSection section,
-        final Category folder,
+        @RequiresPrivilege(CmsConstants.PRIVILEGE_ITEMS_CREATE_NEW)
+        final Folder folder,
         final WorkflowTemplate workflowTemplate,
         final Class<T> type) {
 
@@ -227,21 +233,26 @@ public class ContentItemManager {
      * a the item is republished.
      *
      * @param item   The item to move.
-     * @param targetFolder The folder to which the item is moved.
+     * @param target The folder to which the item is moved.
      */
+    @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
-    public void move(final ContentItem item, final Category targetFolder) {
+    public void move(
+        @RequiresPrivilege(CmsConstants.PRIVILEGE_ITEMS_EDIT)
+        final ContentItem item,
+        @RequiresPrivilege(CmsConstants.PRIVILEGE_ITEMS_EDIT)
+        final Folder target) {
         if (item == null) {
             throw new IllegalArgumentException("The item to move can't be null.");
         }
 
-        if (targetFolder == null) {
+        if (target == null) {
             throw new IllegalArgumentException(
                 "The target folder can't be null.");
         }
 
         final ContentItem draftItem = getDraftVersion(item, item.getClass());
-        final Optional<Category> currentFolder = getItemFolder(item);
+        final Optional<Folder> currentFolder = getItemFolder(item);
 
         if (currentFolder.isPresent()) {
             try {
@@ -254,7 +265,7 @@ public class ContentItemManager {
 
         categoryManager.addObjectToCategory(
             draftItem,
-            targetFolder,
+            target,
             CmsConstants.CATEGORIZATION_TYPE_FOLDER);
 
     }
@@ -271,7 +282,10 @@ public class ContentItemManager {
      */
     @Transactional(Transactional.TxType.REQUIRED)
     @SuppressWarnings("unchecked")
-    public void copy(final ContentItem item, final Category targetFolder) {
+    public void copy(
+        final ContentItem item,
+        @RequiresPrivilege(CmsConstants.PRIVILEGE_ITEMS_CREATE_NEW)
+        final Folder targetFolder) {
         if (item == null) {
             throw new IllegalArgumentException("The item to copy can't be null.");
         }
@@ -317,7 +331,7 @@ public class ContentItemManager {
         draftItem.getCategories().forEach(categorization -> categoryManager
             .addObjectToCategory(copy, categorization.getCategory()));
 
-        final Optional<Category> itemFolder = getItemFolder(draftItem);
+        final Optional<Folder> itemFolder = getItemFolder(draftItem);
         if (itemFolder.isPresent()) {
             try {
                 categoryManager.removeObjectFromCategory(
@@ -490,7 +504,12 @@ public class ContentItemManager {
      *
      * @return The published content item.
      */
-    public ContentItem publish(final ContentItem item) {
+    @AuthorizationRequired
+    @Transactional(Transactional.TxType.REQUIRED)
+    public ContentItem publish(
+        @RequiresPrivilege(CmsConstants.PRIVILEGE_ITEMS_PUBLISH)
+        final ContentItem item) {
+
         if (item == null) {
             throw new IllegalArgumentException(
                 "The item to publish can't be null.");
@@ -512,8 +531,12 @@ public class ContentItemManager {
      *
      * @return The published content item.
      */
+    @AuthorizationRequired
+    @Transactional(Transactional.TxType.REQUIRED)
     @SuppressWarnings("unchecked")
-    public ContentItem publish(final ContentItem item,
+    public ContentItem publish(
+        @RequiresPrivilege(CmsConstants.PRIVILEGE_ITEMS_PUBLISH)
+        final ContentItem item,
         final LifecycleDefinition lifecycleDefinition) {
         if (item == null) {
             throw new IllegalArgumentException(
@@ -704,8 +727,11 @@ public class ContentItemManager {
      *
      * @param item
      */
+    @AuthorizationRequired
     @Transactional(Transactional.TxType.REQUIRED)
-    public void unpublish(final ContentItem item) {
+    public void unpublish(
+        @RequiresPrivilege(CmsConstants.PRIVILEGE_ITEMS_PUBLISH)
+        final ContentItem item) {
         if (item == null) {
             throw new IllegalArgumentException(
                 "The item to unpublish can't be null");
@@ -752,6 +778,7 @@ public class ContentItemManager {
      * @return {@code true} if the content item has a live version,
      *         {@code false} if not.
      */
+    @Transactional(Transactional.TxType.REQUIRED)
     public boolean isLive(final ContentItem item) {
         final TypedQuery<Boolean> query = entityManager.createNamedQuery(
             "ContentItem.hasLiveVersion", Boolean.class);
@@ -772,8 +799,11 @@ public class ContentItemManager {
      *         version is returned. If there is no live version an empty
      *         {@link Optional} is returned.
      */
+    @AuthorizationRequired
+    @Transactional(Transactional.TxType.REQUIRED)
     @SuppressWarnings({"unchecked"})
     public <T extends ContentItem> Optional<T> getLiveVersion(
+        @RequiresPrivilege(CmsConstants.PRIVILEGE_ITEMS_VIEW_PUBLISHED)
         final ContentItem item,
         final Class<T> type) {
 
@@ -831,9 +861,14 @@ public class ContentItemManager {
      *         something is seriously wrong with the database) this method will
      * <b>never</b> return {@code null}.
      */
+    @AuthorizationRequired
+    @Transactional(Transactional.TxType.REQUIRED)
     @SuppressWarnings("unchecked")
-    public <T extends ContentItem> T getDraftVersion(final ContentItem item,
+    public <T extends ContentItem> T getDraftVersion(
+        @RequiresPrivilege(CmsConstants.PRIVILEGE_ITEMS_PREVIEW)
+        final ContentItem item,
         final Class<T> type) {
+        
         if (!ContentItem.class.isAssignableFrom(type)) {
             throw new IllegalArgumentException(String.format(
                 "The provided type \"%s\" does match the type of the provided "
@@ -932,20 +967,40 @@ public class ContentItemManager {
      *
      * @return
      */
-    public List<Category> getItemFolders(final ContentItem item) {
+    public List<Folder> getItemFolders(final ContentItem item) {
         final List<Categorization> result = item.getCategories().stream().
             filter(categorization -> CmsConstants.CATEGORIZATION_TYPE_FOLDER.
                 equals(categorization.getType()))
             .collect(Collectors.toList());
 
-        final List<Category> folders = new ArrayList<>();
+        final List<Folder> folders = new ArrayList<>();
         if (!result.isEmpty()) {
             Category current = result.get(0).getCategory();
-            folders.add(current);
+            if (current instanceof Folder) {
+                folders.add((Folder) current);
+            } else {
+                throw new IllegalArgumentException(String.format(
+                    "The item %s is assigned to the category %s with the"
+                        + "categorization type \"%s\", but the Category is not"
+                        + "a folder. This is no supported.",
+                    item.getUuid(),
+                    current.getUuid(),
+                    CmsConstants.CATEGORIZATION_TYPE_FOLDER));
+            }
 
             while (current.getParentCategory() != null) {
                 current = current.getParentCategory();
-                folders.add(current);
+                if (current instanceof Folder) {
+                    folders.add((Folder) current);
+                } else {
+                    throw new IllegalArgumentException(String.format(
+                        "The item %s is assigned to the category %s with the"
+                            + "categorization type \"%s\", but the Category is not"
+                        + "a folder. This is no supported.",
+                        item.getUuid(),
+                        current.getUuid(),
+                        CmsConstants.CATEGORIZATION_TYPE_FOLDER));
+                }
             }
 
             Collections.reverse(folders);
@@ -964,14 +1019,25 @@ public class ContentItemManager {
      * @return An {@link Optional} containing the folder of the item if the item
      *         is part of a folder.
      */
-    public Optional<Category> getItemFolder(final ContentItem item) {
+    public Optional<Folder> getItemFolder(final ContentItem item) {
         final List<Categorization> result = item.getCategories().stream().
             filter(categorization -> CmsConstants.CATEGORIZATION_TYPE_FOLDER.
                 equals(categorization.getType()))
             .collect(Collectors.toList());
 
         if (result.size() > 0) {
-            return Optional.of(result.get(0).getCategory());
+            final Category category = result.get(0).getCategory();
+            if (category instanceof Folder) {
+                return Optional.of((Folder) category);
+            } else {
+                throw new IllegalArgumentException(String.format(
+                    "The item %s is assigned to the category %s with the"
+                        + "categorization type \"%s\", but the Category is not"
+                        + "a folder. This is no supported.",
+                    item.getUuid(),
+                    category.getUuid(),
+                    CmsConstants.CATEGORIZATION_TYPE_FOLDER));
+            }
         } else {
             return Optional.empty();
         }

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

@@ -88,11 +88,11 @@ public class ContentSection extends CcmApplication implements Serializable {
 
     @OneToOne
     @JoinColumn(name = "ROOT_DOCUMENTS_FOLDER_ID")
-    private Category rootDocumentsFolder;
+    private Folder rootDocumentsFolder;
 
     @OneToOne
     @JoinColumn(name = "ROOT_ASSETS_FOLDER_ID")
-    private Category rootAssetsFolder;
+    private Folder rootAssetsFolder;
 
     @Column(name = "PAGE_RESOLVER_CLASS", length = 1024)
     private String pageResolverClass;
@@ -161,19 +161,19 @@ public class ContentSection extends CcmApplication implements Serializable {
         this.label = label;
     }
 
-    public Category getRootDocumentsFolder() {
+    public Folder getRootDocumentsFolder() {
         return rootDocumentsFolder;
     }
 
-    protected void setRootDocumentFolder(final Category rootDocumentsFolder) {
+    protected void setRootDocumentFolder(final Folder rootDocumentsFolder) {
         this.rootDocumentsFolder = rootDocumentsFolder;
     }
 
-    public Category getRootAssetsFolder() {
+    public Folder getRootAssetsFolder() {
         return rootAssetsFolder;
     }
 
-    protected void setRootAssetsFolder(final Category rootAssetsFolder) {
+    protected void setRootAssetsFolder(final Folder rootAssetsFolder) {
         this.rootAssetsFolder = rootAssetsFolder;
     }
 

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

@@ -104,15 +104,16 @@ public class ContentSectionManager {
         section.setPrimaryUrl(name);
         section.getTitle().addValue(defautLocale, name);
 
-        final Category rootFolder = new Category();
+        final Folder rootFolder = new Folder();
         rootFolder.setName(String.format("%s_root", name));
         rootFolder.getTitle().addValue(defautLocale, rootFolder.getName());
         rootFolder.setDisplayName(rootFolder.getName());
         rootFolder.setUuid(UUID.randomUUID().toString());
         rootFolder.setUniqueId(rootFolder.getUuid());
         rootFolder.setCategoryOrder(1L);
+        rootFolder.setSection(section);
 
-        final Category rootAssetFolder = new Category();
+        final Folder rootAssetFolder = new Folder();
         rootAssetFolder.setName(String.format("%s_assets", name));
         rootAssetFolder.getTitle().addValue(defautLocale,
                                             rootAssetFolder.getName());
@@ -120,6 +121,7 @@ public class ContentSectionManager {
         rootAssetFolder.setUuid(UUID.randomUUID().toString());
         rootAssetFolder.setUniqueId(rootAssetFolder.getUuid());
         rootAssetFolder.setCategoryOrder(1L);
+        rootAssetFolder.setSection(section);
 
         section.setRootDocumentFolder(rootFolder);
         section.setRootAssetsFolder(rootAssetFolder);

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

@@ -89,15 +89,17 @@ public class ContentSectionSetup extends AbstractCcmApplicationSetup {
                      section.getDisplayName(),
                      section.getLabel());
 
-        final Category rootFolder = new Category();
+        final Folder rootFolder = new Folder();
         rootFolder.setUuid(UUID.randomUUID().toString());
         rootFolder.setUniqueId(rootFolder.getUuid());
         rootFolder.setName(String.format("%s_" + ROOT, sectionName));
+        rootFolder.setSection(section);
 
-        final Category rootAssetFolder = new Category();
+        final Folder rootAssetFolder = new Folder();
         rootAssetFolder.setName(String.format("%s_" + ASSETS, sectionName));
         rootAssetFolder.setUuid(UUID.randomUUID().toString());
         rootAssetFolder.setUniqueId(rootAssetFolder.getUuid());
+        rootAssetFolder.setSection(section);
 
         section.setRootDocumentFolder(rootFolder);
         section.setRootAssetsFolder(rootAssetFolder);

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

@@ -0,0 +1,120 @@
+/*
+ * 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 javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+import org.libreccm.categorization.Category;
+import org.libreccm.core.CcmObject;
+
+import java.util.Objects;
+import java.util.Optional;
+
+import javax.persistence.Column;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+
+import static org.librecms.CmsConstants.*;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@Entity
+@Table(name = "FOLDERS", schema = DB_SCHEMA)
+@NamedQueries({
+    @NamedQuery(
+        name = "Folder.rootFolders",
+        query = "SELECT f FROM Folder f "
+                    + "WHERE f.parentCategory IS NULL "
+                    + "  AND f.type = :type"),
+    @NamedQuery(
+        name = "Folder.findByName",
+        query = "SELECT f FROM Folder f WHERE f.name = :name")
+})
+public class Folder extends Category {
+
+    private static final long serialVersionUID = 1L;
+
+    @OneToOne
+    @JoinColumn(name = "CONTENT_SECTION_ID")
+    private ContentSection section;
+
+    @Column(name = "TYPE", nullable = false)
+    @Enumerated(EnumType.STRING)
+    private FolderType type;
+
+    public ContentSection getSection() {
+        return section;
+    }
+
+    protected void setSection(final ContentSection section) {
+        this.section = section;
+    }
+
+    public FolderType getType() {
+        return type;
+    }
+
+    protected void setType(final FolderType type) {
+        this.type = type;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = super.hashCode();
+        hash = 29 * hash + Objects.hashCode(type);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (!super.equals(obj)) {
+            return false;
+        }
+
+        if (!(obj instanceof Folder)) {
+            return false;
+        }
+        final Folder other = (Folder) obj;
+        if (!other.canEqual(this)) {
+            return false;
+        }
+
+        return type == other.getType();
+    }
+
+    @Override
+    public boolean canEqual(final Object obj) {
+        return obj instanceof Folder;
+    }
+
+    @Override
+    public String toString(final String data) {
+        return super.toString(String.format(", type = %s%s",
+                                            type,
+                                            data));
+    }
+
+}

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

@@ -0,0 +1,34 @@
+/*
+ * 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 javax.enterprise.context.RequestScoped;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+*/
+@RequestScoped
+public class FolderManager {
+    
+    //createFolder
+    //deleteFolder
+    //moveFolder
+    
+}

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

@@ -0,0 +1,205 @@
+/*
+ * 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.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.libreccm.categorization.Category;
+import org.libreccm.core.AbstractEntityRepository;
+import org.libreccm.security.AuthorizationRequired;
+import org.libreccm.security.RequiresPrivilege;
+import org.librecms.CmsConstants;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.persistence.TypedQuery;
+import javax.transaction.Transactional;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+public class FolderRepository extends AbstractEntityRepository<Long, Folder> {
+
+    private static final Logger LOGGER = LogManager.getLogger(
+        FolderRepository.class);
+
+    @Inject
+    private ContentSectionRepository sectionRepo;
+
+    @Override
+    public Class<Folder> getEntityClass() {
+        return Folder.class;
+    }
+
+    @Override
+    public boolean isNew(final Folder folder) {
+        return folder.getObjectId() == 0;
+    }
+
+    @Override
+    public void initNewEntity(final Folder folder) {
+        folder.setUuid(UUID.randomUUID().toString());
+    }
+
+    @Transactional(Transactional.TxType.REQUIRED)
+    public List<Folder> getRootDocumentFolders() {
+        final TypedQuery<Folder> query = getEntityManager().createNamedQuery(
+            "Folder.rootFolders", Folder.class);
+        query.setParameter("type", FolderType.DOCUMENTS_FOLDER);
+
+        return query.getResultList();
+    }
+
+    public List<Folder> getRootAssetFolders() {
+        final TypedQuery<Folder> query = getEntityManager().createNamedQuery(
+            "Folder.rootFolders", Folder.class);
+        query.setParameter("type", FolderType.ASSET_FOLDER);
+
+        return query.getResultList();
+    }
+
+    public Optional<Folder> findByPath(final String path,
+                                       final FolderType type) {
+        if (path == null || path.isEmpty()) {
+            throw new IllegalArgumentException("Path can't be null or empty.");
+        }
+
+        if (type == null) {
+            throw new IllegalArgumentException("No folder type provided.");
+        }
+
+        final String[] tokens = path.split(":");
+        if (tokens.length > 2) {
+            throw new InvalidFolderPathException(
+                "The provided path is invalid: More than one colon found. "
+                    + "Valid path format: domainKey:path");
+        }
+
+        if (tokens.length < 2) {
+            throw new InvalidFolderPathException(
+                "The provided path is invalid: No content section found in path. "
+                + "Valid path format: contentSection:path");
+        }
+
+        final ContentSection section = sectionRepo.findByLabel(tokens[0]);
+        if (section == null) {
+            throw new InvalidFolderPathException(String.format(
+                "No content section identified by label \"%s\" found.",
+                tokens[0]));
+        }
+
+        return findByPath(section, tokens[1], type);
+    }
+
+    @Transactional(Transactional.TxType.REQUIRED)
+    public Optional<Folder> findByPath(final ContentSection section,
+                                       final String path,
+                                       final FolderType type) {
+        if (section == null) {
+            throw new IllegalArgumentException("section can't be null");
+        }
+
+        if (path == null || path.isEmpty()) {
+            throw new IllegalArgumentException("Path can't be null or empty.");
+        }
+
+        String normalizedPath = path.replace('.', '/');
+        if (normalizedPath.charAt(0) == '/') {
+            normalizedPath = normalizedPath.substring(1);
+        }
+
+        if (normalizedPath.endsWith("/")) {
+            normalizedPath = normalizedPath.substring(0,
+                                                      normalizedPath.length());
+        }
+
+        LOGGER.debug("Trying to find folder with path \"{}\" and type {} in"
+                         + "content section \"{}\".",
+                     normalizedPath,
+                     type,
+                     section.getLabel());
+        final String[] tokens = normalizedPath.split("/");
+        Folder current;
+        switch(type) {
+            case ASSET_FOLDER:
+                current = section.getRootAssetsFolder();
+                break;
+            case DOCUMENTS_FOLDER:
+                current = section.getRootDocumentsFolder();
+                break;
+            default:
+                throw new IllegalArgumentException(String.format(
+                    "Unexpected folder type %s", type));
+        }
+        for(final String token : tokens) {
+            if (current.getSubCategories() == null) {
+                return Optional.empty();
+            }
+            
+            final Optional<Category> result = current.getSubCategories()
+            .stream()
+            .filter( c -> {
+                LOGGER.debug("#findByPath(ContentSection, String, FolderType: c = {}",
+                             c.toString());
+                LOGGER.debug("#findByPath(ContentSection, String, FolderType: c.getName = \"{}\"",
+                             c.getName());
+                LOGGER.debug("#findByPath(ContentSection, String, FolderType: token = \"{}\"",
+                             token);
+                return c.getName().equals(token);
+            })
+            .findFirst();
+            
+            if (result.isPresent() 
+                && result.get() instanceof Folder) {
+                current = (Folder) result.get();
+            } else {
+                return Optional.empty();
+            }
+        }
+
+        return Optional.of(current);
+    }
+    
+    @AuthorizationRequired
+    @Transactional(Transactional.TxType.REQUIRED)
+    @Override
+    public void save(
+        @RequiresPrivilege(CmsConstants.PRIVILEGE_ITEMS_CREATE_NEW)
+        final Folder folder) {
+        
+        super.save(folder);
+    }
+    
+    @AuthorizationRequired
+    @Transactional(Transactional.TxType.REQUIRED)
+    @Override
+    public void delete(
+        @RequiresPrivilege(CmsConstants.PRIVILEGE_ITEMS_CREATE_NEW)
+        final Folder folder) {
+        
+        super.delete(folder);
+    }
+
+}

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

@@ -0,0 +1,30 @@
+/*
+ * 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;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public enum FolderType {
+    
+    DOCUMENTS_FOLDER,
+    ASSET_FOLDER,
+    
+}

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

@@ -0,0 +1,67 @@
+/*
+ * 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;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+public class InvalidFolderPathException extends RuntimeException {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Creates a new instance of <code>InvalidFolderPathException</code> without detail message.
+     */
+    public InvalidFolderPathException() {
+        super();
+    }
+
+
+    /**
+     * Constructs an instance of <code>InvalidFolderPathException</code> with the specified detail message.
+     *
+     * @param msg The detail message.
+     */
+    public InvalidFolderPathException(final String msg) {
+        super(msg);
+    }
+
+    /**
+      * Constructs an instance of <code>InvalidFolderPathException</code> which wraps the 
+      * specified exception.
+      *
+      * @param exception The exception to wrap.
+      */
+    public InvalidFolderPathException(final Exception exception) {
+        super(exception);
+    }
+
+    /**
+      * Constructs an instance of <code>InvalidFolderPathException</code> with the specified message which also wraps the 
+      * specified exception.
+      *
+      * @param msg The detail message.
+      * @param exception The exception to wrap.
+      */
+    public InvalidFolderPathException(final String msg, final Exception exception) {
+        super(msg, exception);
+    }
+}

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

@@ -90,6 +90,9 @@ public class ContentItemManagerTest {
     @Inject
     private CategoryRepository categoryRepo;
 
+    @Inject
+    private FolderRepository folderRepo;
+    
     @Inject
     private Shiro shiro;
 
@@ -247,7 +250,7 @@ public class ContentItemManagerTest {
         })
     public void createContentItem() {
         final ContentSection section = sectionRepo.findByLabel("info");
-        final Category folder = section.getRootDocumentsFolder();
+        final Folder folder = section.getRootDocumentsFolder();
 
         final Article article = itemManager.createContentItem("new-article",
                                                               section,
@@ -284,7 +287,7 @@ public class ContentItemManagerTest {
     @ShouldThrowException(IllegalArgumentException.class)
     public void createItemTypeNotInSection() {
         final ContentSection section = sectionRepo.findByLabel("info");
-        final Category folder = section.getRootDocumentsFolder();
+        final Folder folder = section.getRootDocumentsFolder();
 
         itemManager.createContentItem("Test", section, folder, Event.class);
     }
@@ -298,7 +301,7 @@ public class ContentItemManagerTest {
     @ShouldThrowException(IllegalArgumentException.class)
     public void createItemNameIsNull() {
         final ContentSection section = sectionRepo.findByLabel("info");
-        final Category folder = section.getRootDocumentsFolder();
+        final Folder folder = section.getRootDocumentsFolder();
 
         itemManager.createContentItem(null, section, folder, Article.class);
     }
@@ -312,7 +315,7 @@ public class ContentItemManagerTest {
     @ShouldThrowException(IllegalArgumentException.class)
     public void createItemNameIsEmpty() {
         final ContentSection section = sectionRepo.findByLabel("info");
-        final Category folder = section.getRootDocumentsFolder();
+        final Folder folder = section.getRootDocumentsFolder();
 
         itemManager.createContentItem("", section, folder, Article.class);
     }
@@ -353,7 +356,7 @@ public class ContentItemManagerTest {
         })
     public void createContentItemWithWorkflow() {
         final ContentSection section = sectionRepo.findByLabel("info");
-        final Category folder = section.getRootDocumentsFolder();
+        final Folder folder = section.getRootDocumentsFolder();
 
         final WorkflowTemplate workflowTemplate = workflowTemplateRepo
             .findById(-110L);
@@ -395,7 +398,7 @@ public class ContentItemManagerTest {
     @ShouldThrowException(IllegalArgumentException.class)
     public void createItemTypeNotInSectionWithWorkflow() {
         final ContentSection section = sectionRepo.findByLabel("info");
-        final Category folder = section.getRootDocumentsFolder();
+        final Folder folder = section.getRootDocumentsFolder();
 
         final WorkflowTemplate workflowTemplate = workflowTemplateRepo
             .findById(-110L);
@@ -416,7 +419,7 @@ public class ContentItemManagerTest {
     @ShouldThrowException(IllegalArgumentException.class)
     public void createItemNameIsNullWithWorkflow() {
         final ContentSection section = sectionRepo.findByLabel("info");
-        final Category folder = section.getRootDocumentsFolder();
+        final Folder folder = section.getRootDocumentsFolder();
 
         final WorkflowTemplate workflowTemplate = workflowTemplateRepo
             .findById(-110L);
@@ -437,7 +440,7 @@ public class ContentItemManagerTest {
     @ShouldThrowException(IllegalArgumentException.class)
     public void createItemNameIsNullWorkflowIsNull() {
         final ContentSection section = sectionRepo.findByLabel("info");
-        final Category folder = section.getRootDocumentsFolder();
+        final Folder folder = section.getRootDocumentsFolder();
 
         itemManager.createContentItem(null,
                                       section,
@@ -486,7 +489,7 @@ public class ContentItemManagerTest {
         final Optional<ContentItem> item = itemRepo.findById(-10100L);
         assertThat(item.isPresent(), is(true));
 
-        final Category targetFolder = categoryRepo.findById(-2120L);
+        final Folder targetFolder = folderRepo.findById(-2120L);
         assertThat(targetFolder, is(not(nullValue())));
 
         itemManager.move(item.get(), targetFolder);
@@ -500,7 +503,7 @@ public class ContentItemManagerTest {
                             + "ContentItemManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void moveItemNull() {
-        final Category targetFolder = categoryRepo.findById(-2120L);
+        final Folder targetFolder = folderRepo.findById(-2120L);
         assertThat(targetFolder, is(not(nullValue())));
 
         itemManager.move(null, targetFolder);
@@ -544,7 +547,7 @@ public class ContentItemManagerTest {
         final Optional<ContentItem> item = itemRepo.findById(-10100L);
         assertThat(item.isPresent(), is(true));
 
-        final Category targetFolder = categoryRepo.findById(-2120L);
+        final Folder targetFolder = folderRepo.findById(-2120L);
         assertThat(targetFolder, is(not(nullValue())));
 
         itemManager.copy(item.get(), targetFolder);
@@ -574,7 +577,7 @@ public class ContentItemManagerTest {
         final Optional<ContentItem> item = itemRepo.findById(-10100L);
         assertThat(item.isPresent(), is(true));
 
-        final Category targetFolder = categoryRepo.findById(-2110L);
+        final Folder targetFolder = folderRepo.findById(-2110L);
         assertThat(targetFolder, is(not(nullValue())));
 
         itemManager.copy(item.get(), targetFolder);
@@ -589,7 +592,7 @@ public class ContentItemManagerTest {
                     + "ContentItemManagerTest/data.xml")
     @ShouldThrowException(IllegalArgumentException.class)
     public void copyItemNull() {
-        final Category targetFolder = categoryRepo.findById(-2120L);
+        final Folder targetFolder = folderRepo.findById(-2120L);
         assertThat(targetFolder, is(not(nullValue())));
 
         itemManager.copy(null, targetFolder);

ccm-core/src/main/java/org/libreccm/categorization/Category.java

@@ -69,10 +69,11 @@ import javax.xml.bind.annotation.XmlRootElement;
 @Entity
 @Table(name = "CATEGORIES", schema = DB_SCHEMA)
 @NamedQueries({
-    @NamedQuery(name = "Category.topLevelCategories",
+    @NamedQuery(
-                query
+        name = "Category.topLevelCategories",
-                    = "SELECT c FROM Category c WHERE c.parentCategory IS NULL"),
+        query = "SELECT c FROM Category c WHERE c.parentCategory IS NULL"),
-    @NamedQuery(name = "Category.findByName",
+    @NamedQuery(
+        name = "Category.findByName",
         query = "SELECT c FROM Category c WHERE c.name = :name")
 })
 @NamedEntityGraphs({
@@ -82,8 +83,7 @@ import javax.xml.bind.annotation.XmlRootElement;
             @NamedAttributeNode(value = "subCategories"
             //,
             //                    subgraph = "subCategories"
-            ),
+            ), //@NamedAttributeNode(value = "objects")
-            //@NamedAttributeNode(value = "objects")
         }
     //        ,
     //        subgraphs = {
@@ -339,7 +339,6 @@ public class Category extends CcmObject implements InheritsPermissions,
         this.categoryOrder = categoryOrder;
     }
 
-    
     @Override
     public Optional<CcmObject> getParent() {
         return Optional.ofNullable(getParentCategory());

ccm-core/src/main/java/org/libreccm/categorization/CategoryRepository.java

@@ -75,6 +75,7 @@ public class CategoryRepository extends AbstractEntityRepository<Long, Category>
      *
      * @return A list of all top level categories.
      */
+    @Transactional(Transactional.TxType.REQUIRED)
     public List<Category> getTopLevelCategories() {
         final TypedQuery<Category> query = getEntityManager().createNamedQuery(
             "Category.topLevelCategories", Category.class);
@@ -82,6 +83,7 @@ public class CategoryRepository extends AbstractEntityRepository<Long, Category>
         return query.getResultList();
     }
 
+    @Transactional(Transactional.TxType.REQUIRED)
     public Category findByPath(final String path) {
         if (path == null || path.isEmpty()) {
             throw new IllegalArgumentException("Path can't be null or empty.");
@@ -110,6 +112,7 @@ public class CategoryRepository extends AbstractEntityRepository<Long, Category>
         return findByPath(domain, tokens[1]);
     }
 
+    @Transactional(Transactional.TxType.REQUIRED)
     public Category findByPath(final Domain domain, final String path) {
         if (domain == null) {
             throw new IllegalArgumentException("Domain can't be null.");
@@ -129,11 +132,10 @@ public class CategoryRepository extends AbstractEntityRepository<Long, Category>
                                                       normalizedPath.length());
         }
 
-        LOGGER.debug(String.format(
+        LOGGER.debug("Trying to find category with path \"{}\" in "
-            "Trying to find category with path \"%s\" in "
+            + "domain \"{}\".",
-                + "domain \"%s\".",
                      normalizedPath,
-            domain.getDomainKey()));
+                     domain.getDomainKey());
         final String[] tokens = normalizedPath.split("/");
         Category current = domain.getRoot();
         for (final String token : tokens) {
@@ -153,6 +155,7 @@ public class CategoryRepository extends AbstractEntityRepository<Long, Category>
                     return c.getName().equals(token);
                 })
                 .findFirst();
+            
             if (result.isPresent()) {
                 current = result.get();
             } else {
@@ -164,7 +167,6 @@ public class CategoryRepository extends AbstractEntityRepository<Long, Category>
     }
 
     @AuthorizationRequired
-
     @Transactional(Transactional.TxType.REQUIRED)
     @Override
     public void save(