From 5fb80631c9c8002240e12e9dfe809c95058b3fe7 Mon Sep 17 00:00:00 2001
From: tosmers <tosmers@8810af33-2d31-482b-a856-94f89814c4df>
Date: Mon, 21 Nov 2016 17:39:45 +0000
Subject: [PATCH] [FEATURE] - adds implementation of abstract marshaller class
 to every exportable class - adds interface tag 'Portable' to each class with
 wishes of being ex- or imported

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4448 8810af33-2d31-482b-a856-94f89814c4df
---
 .svnignore                                    |  2 +-
 .../categorization/Categorization.java        | 15 ++--
 .../CategorizationMarshaller.java             | 50 +++++++++++
 .../org/libreccm/categorization/Category.java |  8 +-
 .../categorization/CategoryMarshaller.java    | 43 +++++++++
 .../java/org/libreccm/core/CcmObject.java     | 12 +--
 .../portation/AbstractMarshaller.java         | 90 ++++++++++---------
 .../java/org/libreccm/portation/Format.java   |  2 +-
 .../org/libreccm/portation/Marshaller.java    | 58 ++++++------
 .../java/org/libreccm/portation/Marshals.java |  2 +-
 .../java/org/libreccm/portation/Portable.java | 28 ++++++
 .../java/org/libreccm/security/Group.java     |  5 +-
 .../libreccm/security/GroupMarshaller.java    | 43 +++++++++
 .../libreccm/security/GroupMembership.java    |  7 +-
 .../security/GroupMembershipMarshaller.java   | 48 ++++++++++
 .../java/org/libreccm/security/Party.java     |  3 +
 .../org/libreccm/security/Permission.java     | 21 +++--
 .../security/PermissionMarshaller.java        | 48 ++++++++++
 .../main/java/org/libreccm/security/Role.java | 27 +++---
 .../org/libreccm/security/RoleMarshaller.java | 43 +++++++++
 .../org/libreccm/security/RoleMembership.java |  7 +-
 .../security/RoleMembershipMarshaller.java    | 48 ++++++++++
 .../main/java/org/libreccm/security/User.java |  5 +-
 .../org/libreccm/security/UserMarshaller.java | 43 +++++++++
 .../org/libreccm/workflow/AssignableTask.java |  5 +-
 .../workflow/AssignableTaskMarshaller.java    | 43 +++++++++
 .../org/libreccm/workflow/TaskAssignment.java |  6 +-
 .../workflow/TaskAssignmentMarshaller.java    | 48 ++++++++++
 .../java/org/libreccm/workflow/Workflow.java  |  9 +-
 .../libreccm/workflow/WorkflowMarshaller.java | 43 +++++++++
 .../libreccm/workflow/WorkflowTemplate.java   | 18 ++--
 .../workflow/WorkflowTemplateMarshaller.java  | 44 +++++++++
 .../libreccm/docrepo/AbstractResource.java    |  4 +-
 .../java/org/libreccm/docrepo/BlobObject.java |  3 +-
 .../docrepo/BlobObjectMarshaller.java         |  4 +-
 .../org/libreccm/docrepo/FileMarshaller.java  |  4 +-
 .../libreccm/docrepo/FolderMarshaller.java    |  4 +-
 .../java/org/libreccm/docrepo/Repository.java |  3 +-
 .../docrepo/RepositoryMarshaller.java         |  4 +-
 .../docrepo/FilePortationTest/test2.xml       |  2 +-
 .../docrepo/FilePortationTest/test3.xml       |  6 +-
 .../docrepo/FilePortationTest/test4.xml       |  6 +-
 42 files changed, 773 insertions(+), 141 deletions(-)
 create mode 100644 ccm-core/src/main/java/org/libreccm/categorization/CategorizationMarshaller.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/categorization/CategoryMarshaller.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/portation/Portable.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/security/GroupMarshaller.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/security/GroupMembershipMarshaller.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/security/PermissionMarshaller.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/security/RoleMarshaller.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/security/RoleMembershipMarshaller.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/security/UserMarshaller.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskMarshaller.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentMarshaller.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/workflow/WorkflowMarshaller.java
 create mode 100644 ccm-core/src/main/java/org/libreccm/workflow/WorkflowTemplateMarshaller.java

diff --git a/.svnignore b/.svnignore
index 57e6ec717..d7014a6bf 100644
--- a/.svnignore
+++ b/.svnignore
@@ -2,4 +2,4 @@
 *.iml
 target
 nb-configuration.xml
-*.log
\ No newline at end of file
+*.log
diff --git a/ccm-core/src/main/java/org/libreccm/categorization/Categorization.java b/ccm-core/src/main/java/org/libreccm/categorization/Categorization.java
index ad7bf1397..de1e90bd5 100644
--- a/ccm-core/src/main/java/org/libreccm/categorization/Categorization.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/Categorization.java
@@ -18,12 +18,9 @@
  */
 package org.libreccm.categorization;
 
-import static org.libreccm.core.CoreConstants.*;
-
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import org.libreccm.core.CcmObject;
-
-import java.io.Serializable;
-import java.util.Objects;
+import org.libreccm.portation.Portable;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -35,6 +32,10 @@ import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Objects;
+
+import static org.libreccm.core.CoreConstants.DB_SCHEMA;
 
 /**
  * Association class describing the association between a category and an
@@ -66,7 +67,7 @@ import javax.persistence.Table;
                     + "WHERE c.category = :category "
                     + "AND c.index = TRUE")
 })
-public class Categorization implements Serializable {
+public class Categorization implements Serializable, Portable {
 
     private static final long serialVersionUID = 201504301320L;
 
@@ -83,6 +84,7 @@ public class Categorization implements Serializable {
      */
     @ManyToOne
     @JoinColumn(name = "CATEGORY_ID")
+    @JsonBackReference
     private Category category;
 
     /**
@@ -90,6 +92,7 @@ public class Categorization implements Serializable {
      */
     @ManyToOne
     @JoinColumn(name = "OBJECT_ID")
+    @JsonBackReference
     private CcmObject categorizedObject;
 
     /**
diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategorizationMarshaller.java b/ccm-core/src/main/java/org/libreccm/categorization/CategorizationMarshaller.java
new file mode 100644
index 000000000..1c9bd23c3
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/categorization/CategorizationMarshaller.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2015 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.libreccm.categorization;
+
+import org.libreccm.portation.AbstractMarshaller;
+
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import javax.transaction.Transactional;
+
+/**
+ * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
+ * @version created on 11/7/16
+ */
+public class CategorizationMarshaller extends AbstractMarshaller<Categorization>{
+
+    @Inject
+    private EntityManager entityManager;
+
+    @Override
+    protected Class<Categorization> getObjectClass() {
+        return Categorization.class;
+    }
+
+    @Override
+    @Transactional(Transactional.TxType.REQUIRED)
+    protected void insertIntoDb(Categorization portableObject) {
+        if (portableObject.getCategorizationId() == 0) {
+            entityManager.persist(portableObject);
+        } else {
+            entityManager.merge(portableObject);
+        }
+    }
+}
diff --git a/ccm-core/src/main/java/org/libreccm/categorization/Category.java b/ccm-core/src/main/java/org/libreccm/categorization/Category.java
index 32303896e..45adb1f5a 100644
--- a/ccm-core/src/main/java/org/libreccm/categorization/Category.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/Category.java
@@ -21,10 +21,13 @@ package org.libreccm.categorization;
 import static org.libreccm.categorization.CategorizationConstants.*;
 import static org.libreccm.core.CoreConstants.*;
 
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 import org.hibernate.validator.constraints.NotBlank;
 import org.libreccm.core.CcmObject;
 import org.libreccm.core.DefaultEntityGraph;
 import org.libreccm.l10n.LocalizedString;
+import org.libreccm.portation.Portable;
 import org.libreccm.security.InheritsPermissions;
 
 import java.io.Serializable;
@@ -100,7 +103,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 @DefaultEntityGraph("Category.withSubCategoriesAndObjects")
 @XmlRootElement(name = "category", namespace = CAT_XML_NS)
 public class Category extends CcmObject implements InheritsPermissions,
-                                                   Serializable {
+                                                   Serializable, Portable {
 
     private static final long serialVersionUID = -7250208963391878547L;
 
@@ -179,6 +182,7 @@ public class Category extends CcmObject implements InheritsPermissions,
      */
     @OneToMany(mappedBy = "category")
     @XmlElementWrapper(name = "objects", namespace = CAT_XML_NS)
+    @JsonManagedReference
     private List<Categorization> objects;
 
     /**
@@ -187,6 +191,7 @@ public class Category extends CcmObject implements InheritsPermissions,
     @OneToMany(mappedBy = "parentCategory")
     @XmlElementWrapper(name = "subcategories", namespace = CAT_XML_NS)
     @XmlElement(name = "category")
+    @JsonManagedReference
     private List<Category> subCategories;
 
     /**
@@ -195,6 +200,7 @@ public class Category extends CcmObject implements InheritsPermissions,
      */
     @ManyToOne
     @JoinColumn(name = "PARENT_CATEGORY_ID")
+    @JsonBackReference
     private Category parentCategory;
 
     /**
diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategoryMarshaller.java b/ccm-core/src/main/java/org/libreccm/categorization/CategoryMarshaller.java
new file mode 100644
index 000000000..c5aaec025
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/categorization/CategoryMarshaller.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2015 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.libreccm.categorization;
+
+import org.libreccm.portation.AbstractMarshaller;
+
+import javax.inject.Inject;
+
+/**
+ * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
+ * @version created on 11/7/16
+ */
+public class CategoryMarshaller extends AbstractMarshaller<Category> {
+
+    @Inject
+    private CategoryRepository categoryRepository;
+
+    @Override
+    protected Class<Category> getObjectClass() {
+        return Category.class;
+    }
+
+    @Override
+    protected void insertIntoDb(Category portableObject) {
+        categoryRepository.save(portableObject);
+    }
+}
diff --git a/ccm-core/src/main/java/org/libreccm/core/CcmObject.java b/ccm-core/src/main/java/org/libreccm/core/CcmObject.java
index f196fccee..e7b692844 100644
--- a/ccm-core/src/main/java/org/libreccm/core/CcmObject.java
+++ b/ccm-core/src/main/java/org/libreccm/core/CcmObject.java
@@ -18,9 +18,12 @@
  */
 package org.libreccm.core;
 
+import com.fasterxml.jackson.annotation.JsonManagedReference;
+import org.hibernate.envers.Audited;
 import org.libreccm.categorization.Categorization;
 import org.libreccm.categorization.Category;
 import org.libreccm.categorization.CategoryManager;
+import org.libreccm.portation.Portable;
 import org.libreccm.security.Permission;
 
 import javax.persistence.Column;
@@ -38,7 +41,6 @@ import javax.validation.constraints.NotNull;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -48,8 +50,6 @@ import java.util.Objects;
 import static org.libreccm.core.CoreConstants.CORE_XML_NS;
 import static org.libreccm.core.CoreConstants.DB_SCHEMA;
 
-import org.hibernate.envers.Audited;
-
 /**
  * Root class of all entities in LibreCCM which need categorisation and
  * permission services.
@@ -117,6 +117,7 @@ public class CcmObject implements Identifiable, Serializable {
     @OneToMany(mappedBy = "object")
     @XmlElementWrapper(name = "permissions", namespace = CORE_XML_NS)
     @XmlElement(name = "permission", namespace = CORE_XML_NS)
+    @JsonManagedReference
     private List<Permission> permissions;
 
     /**
@@ -125,6 +126,7 @@ public class CcmObject implements Identifiable, Serializable {
     @OneToMany(mappedBy = "categorizedObject")
     @XmlElementWrapper(name = "categories", namespace = CORE_XML_NS)
     @XmlElement(name = "category", namespace = CORE_XML_NS)
+    @JsonManagedReference
     private List<Categorization> categories;
 
     public CcmObject() {
@@ -164,7 +166,7 @@ public class CcmObject implements Identifiable, Serializable {
      * @return Returns all permissions for this {@code CcmObject}. Please note
      *         that the returned {@link List} can't be modified. For adding and
      *         removing permissions use the methods provided by the
-     *         {@link CcmObjectManager}.
+     *         {@code CcmObjectManager}.
      */
     public List<Permission> getPermissions() {
         return Collections.unmodifiableList(permissions);
@@ -311,7 +313,7 @@ public class CcmObject implements Identifiable, Serializable {
      *
      * @param obj The object to check.
      *
-     * @return {@code true} if {@link obj} can equal this, false otherwise.
+     * @return {@code true} if {@code obj} can equal this, false otherwise.
      */
     public boolean canEqual(final Object obj) {
         return obj instanceof CcmObject;
diff --git a/ccm-core/src/main/java/org/libreccm/portation/AbstractMarshaller.java b/ccm-core/src/main/java/org/libreccm/portation/AbstractMarshaller.java
index 800f4d3dd..1d654eb14 100644
--- a/ccm-core/src/main/java/org/libreccm/portation/AbstractMarshaller.java
+++ b/ccm-core/src/main/java/org/libreccm/portation/AbstractMarshaller.java
@@ -23,7 +23,6 @@ import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import org.apache.log4j.Logger;
-import org.libreccm.core.Identifiable;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -42,7 +41,7 @@ import java.util.List;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
  * @version created the 2/10/16
  */
-public abstract class AbstractMarshaller<I extends Identifiable> {
+public abstract class AbstractMarshaller<P extends Portable> {
 
     private static final Logger log = Logger.getLogger(AbstractMarshaller.class);
 
@@ -52,14 +51,19 @@ public abstract class AbstractMarshaller<I extends Identifiable> {
     // XML specifics
     ObjectMapper xmlMapper;
 
-    // JSON specifics
-
-    // CSV specifics
-
-
-
-    public void prepare(final Format format, String filename, boolean
-            indentation) {
+    /**
+     * Prepares import and export routine. Sets the format in which the ex-
+     * or import will take place and sets the name of the file exported to or
+     * imported from. Furthermore it is possible to decide for or against
+     * indentation in the output file.
+     *
+     * @param format The format of the ex-/import
+     * @param filename The filename of the file exported to or imported from
+     * @param indentation whether or not indentation
+     */
+    public void prepare(final Format format,
+                        String filename,
+                        boolean indentation) {
         this.format = format;
         this.filename = filename;
 
@@ -74,19 +78,20 @@ public abstract class AbstractMarshaller<I extends Identifiable> {
                 }
                 break;
 
-            case JSON:
-                break;
-
-            case CSV:
-                break;
-
             default:
                 break;
         }
     }
 
 
-    public void exportList(final List<I> exportList) {
+    /**
+     * Export routine for lists with the same object type {@code P}. Creates a
+     * new file with the prepared filename and starts, depending on the set
+     * format, the export process, object after object.
+     *
+     * @param exportList List of equally typed objects.
+     */
+    public void exportList(final List<P> exportList) {
         File file = new File(filename);
         FileWriter fileWriter = null;
 
@@ -97,7 +102,7 @@ public abstract class AbstractMarshaller<I extends Identifiable> {
                     " with the name %s.", file.getName()));
         }
         if (fileWriter != null) {
-            for (I object : exportList) {
+            for (P object : exportList) {
                 String line = null;
 
                 switch (format) {
@@ -112,41 +117,37 @@ public abstract class AbstractMarshaller<I extends Identifiable> {
                         }
                         break;
 
-                    case JSON:
-                        break;
-
-                    case CSV:
-                        break;
-
                     default:
                         break;
                 }
-
                 if (line != null) {
                     try {
                         fileWriter.write(line);
                         fileWriter.write(System.getProperty("line.separator"));
                     } catch (IOException e) {
-                        log.error(String.format("Unable to write to file with the" +
-                                " name %s.", file.getName()));
+                        log.error(String.format("Unable to write to file with" +
+                                " the name %s.", file.getName()));
                     }
                 }
             }
-
             try {
                 fileWriter.close();
             } catch (IOException e) {
                 log.error(String.format("Unable to close a fileWriter for the" +
                         " file with the name %s.", file.getName()));
             }
-
         }
     }
 
-    protected abstract Class<I> getObjectClass();
-    protected abstract void insertIntoDb(I object);
-
-    public List<I> importFile() {
+    /**
+     * Import routine for files containing objects of the same type {@code P}.
+     * Creates a new list of strings to read the file line by line. Each line
+     * of the list represents an object of the file. Then retrieves each object
+     * from the corresponding string in the list.
+     *
+     * @return List of imported objects.
+     */
+    public List<P> importFile() {
         File file = new File(filename);
 
         List<String> lines = null;
@@ -157,10 +158,10 @@ public abstract class AbstractMarshaller<I extends Identifiable> {
                     "name %s.", file.getName()));
         }
 
-        List<I> objects = new ArrayList<I>();
+        List<P> objects = new ArrayList<>();
         if (lines != null) {
             for (String line : lines) {
-                I object = null;
+                P object = null;
                 switch (format) {
                     case XML:
                         try {
@@ -171,12 +172,6 @@ public abstract class AbstractMarshaller<I extends Identifiable> {
                         }
                         break;
 
-                    case JSON:
-                        break;
-
-                    case CSV:
-                        break;
-
                     default:
                         break;
                 }
@@ -189,4 +184,17 @@ public abstract class AbstractMarshaller<I extends Identifiable> {
         return objects;
     }
 
+    /**
+     * Abstract method to get the object class to determine the type {@code P}.
+     *
+     * @return The object class
+     */
+    protected abstract Class<P> getObjectClass();
+
+    /**
+     * Abstract method to insert every imported object into the database.
+     *
+     * @param portableObject An object of type {@code P}
+     */
+    protected abstract void insertIntoDb(P portableObject);
 }
diff --git a/ccm-core/src/main/java/org/libreccm/portation/Format.java b/ccm-core/src/main/java/org/libreccm/portation/Format.java
index 34b371b7f..31277e9ae 100644
--- a/ccm-core/src/main/java/org/libreccm/portation/Format.java
+++ b/ccm-core/src/main/java/org/libreccm/portation/Format.java
@@ -23,5 +23,5 @@ package org.libreccm.portation;
  * @version created the 03.02.2016
  */
 public enum Format {
-    CSV, XML, JSON
+    XML
 }
diff --git a/ccm-core/src/main/java/org/libreccm/portation/Marshaller.java b/ccm-core/src/main/java/org/libreccm/portation/Marshaller.java
index 761698646..dc379ce17 100644
--- a/ccm-core/src/main/java/org/libreccm/portation/Marshaller.java
+++ b/ccm-core/src/main/java/org/libreccm/portation/Marshaller.java
@@ -45,13 +45,11 @@ public class Marshaller {
 
     @Inject
     @Any
-    private Instance<AbstractMarshaller<? extends Identifiable>>
-            marshallerInstances;
-
-    // Assigns lists with objects of the same type as values to their typ as
-    // key.
-    private Map<Class<? extends Identifiable>, List<Identifiable>> classListMap;
+    private Instance<AbstractMarshaller<? extends Portable>> marshallerInstances;
 
+    // Assigns lists with objects of the same type as values to their typ.
+    // The type represents the key
+    private Map<Class<? extends Portable>, List<Portable>> classListMap;
 
     /**
      * Main export method. Organizes the objects into list of the same type
@@ -61,11 +59,12 @@ public class Marshaller {
      * @param format The export style/format e.g. CSV or JSON
      * @param filename The name of the file to be exported to
      */
-    public void exportObjects(List<Identifiable> objects, Format format,
-                               String filename) {
+    public void exportObjects(List<Portable> objects,
+                              Format format,
+                              String filename) {
         putObjects(objects);
 
-        for (Map.Entry<Class<? extends Identifiable>, List<Identifiable>>
+        for (Map.Entry<Class<? extends Portable>, List<Portable>>
             classListEntry : classListMap.entrySet()) {
             exportList(classListEntry.getValue(), classListEntry.getKey(),
                     format, filename);
@@ -81,14 +80,14 @@ public class Marshaller {
      *
      * @param objects list of all objects being organized
      */
-    private void putObjects(List<Identifiable> objects) {
-        for (Identifiable object : objects) {
-            Class<? extends Identifiable> type = object.getClass();
+    private void putObjects(List<Portable> objects) {
+        for (Portable object : objects) {
+            Class<? extends Portable> type = object.getClass();
 
             if (classListMap.containsKey(type)) {
                 classListMap.get(type).add(object);
             } else {
-                List<Identifiable> values = new ArrayList<>();
+                List<Portable> values = new ArrayList<>();
                 values.add(object);
                 classListMap.put(type, values);
             }
@@ -107,12 +106,13 @@ public class Marshaller {
      * @param type The class of the type
      * @param format The export style
      * @param filename The filename
-     * @param <I> The type of the current marshaller
+     * @param <P> The type of the current marshaller
      */
-    private <I extends Identifiable> void exportList(List<I> list, Class<?
-            extends I> type, Format format, String filename) {
-
-        final Instance<AbstractMarshaller<? extends Identifiable>>
+    private <P extends Portable> void exportList(List<P> list,
+                                                 Class<? extends P> type,
+                                                 Format format,
+                                                 String filename) {
+        final Instance<AbstractMarshaller<? extends Portable>>
                 marshallerInstance = marshallerInstances.select(new
                 MarshalsLiteral(type));
 
@@ -127,10 +127,10 @@ public class Marshaller {
                             .getName()));
         } else {
             // Get the marshaller for this list and call the export method.
-            final Iterator<AbstractMarshaller<? extends Identifiable>>
+            final Iterator<AbstractMarshaller<? extends Portable>>
                     iterator = marshallerInstance.iterator();
             @SuppressWarnings("unchecked")
-            final AbstractMarshaller<I> marshaller = (AbstractMarshaller<I>)
+            final AbstractMarshaller<P> marshaller = (AbstractMarshaller<P>)
                     iterator.next();
 
             marshaller.prepare(format, filename + "__" + type.toString(),
@@ -151,9 +151,9 @@ public class Marshaller {
      *
      * @param filenames List of filenames for the files wishing to be imported
      * @param format The import style
-     * @param <I> The type of the current marshaller
+     * @param <P> The type of the current marshaller
      */
-    public <I extends Identifiable> void importObjects(
+    public <P extends Portable> void importObjects(
             List<String> filenames, Format format) {
         for (String filename : filenames) {
             String[] splitFilename = filename.split("__");
@@ -163,9 +163,9 @@ public class Marshaller {
             try {
                 Class clazz = Class.forName(className);
                 @SuppressWarnings("unchecked")
-                Class<I> type = clazz.asSubclass(Identifiable.class);
+                Class<P> type = clazz.asSubclass(Portable.class);
 
-                final Instance<AbstractMarshaller<? extends Identifiable>>
+                final Instance<AbstractMarshaller<? extends Portable>>
                         marshallerInstance = marshallerInstances.select(new
                         MarshalsLiteral(type));
 
@@ -180,10 +180,10 @@ public class Marshaller {
                                     .getName()));
                 } else {
                     // Get the marshaller for this list and call the export method.
-                    final Iterator<AbstractMarshaller<? extends Identifiable>>
+                    final Iterator<AbstractMarshaller<? extends Portable>>
                             iterator = marshallerInstance.iterator();
                     @SuppressWarnings("unchecked")
-                    final AbstractMarshaller<I> marshaller = (AbstractMarshaller<I>)
+                    final AbstractMarshaller<P> marshaller = (AbstractMarshaller<P>)
                             iterator.next();
 
                     marshaller.prepare(format, filename, false);
@@ -202,14 +202,14 @@ public class Marshaller {
             implements Marshals {
 
         private static final long serialVersionUID = -8093783826632252875L;
-        private final Class<? extends Identifiable> entityClass;
+        private final Class<? extends Portable> entityClass;
 
-        public MarshalsLiteral(Class<? extends Identifiable> entityClass) {
+        public MarshalsLiteral(Class<? extends Portable> entityClass) {
             this.entityClass = entityClass;
         }
 
         @Override
-        public Class<? extends Identifiable> value() {
+        public Class<? extends Portable> value() {
             return entityClass;
         }
     }
diff --git a/ccm-core/src/main/java/org/libreccm/portation/Marshals.java b/ccm-core/src/main/java/org/libreccm/portation/Marshals.java
index 636c78a0c..c1c34c0af 100644
--- a/ccm-core/src/main/java/org/libreccm/portation/Marshals.java
+++ b/ccm-core/src/main/java/org/libreccm/portation/Marshals.java
@@ -42,5 +42,5 @@ import java.lang.annotation.Target;
         ElementType.METHOD})
 public @interface Marshals {
 
-    Class<? extends Identifiable> value();
+    Class<? extends Portable> value();
 }
diff --git a/ccm-core/src/main/java/org/libreccm/portation/Portable.java b/ccm-core/src/main/java/org/libreccm/portation/Portable.java
new file mode 100644
index 000000000..a27d3632c
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/portation/Portable.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2015 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.libreccm.portation;
+
+/**
+ * Interface for the ex-/import routine. With this interface any object class
+ * can declare itself ex- or im{@code portable}.
+ *
+ * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
+ * @version created on 11/3/16
+ */
+public interface Portable {}
diff --git a/ccm-core/src/main/java/org/libreccm/security/Group.java b/ccm-core/src/main/java/org/libreccm/security/Group.java
index 94f74a4e2..17d5b463e 100644
--- a/ccm-core/src/main/java/org/libreccm/security/Group.java
+++ b/ccm-core/src/main/java/org/libreccm/security/Group.java
@@ -20,7 +20,9 @@ package org.libreccm.security;
 
 import static org.libreccm.core.CoreConstants.*;
 
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 import org.libreccm.core.DefaultEntityGraph;
+import org.libreccm.portation.Portable;
 
 import java.io.Serializable;
 import java.util.Collections;
@@ -88,7 +90,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 })
 @DefaultEntityGraph("Group.withMembersAndRoleMemberships")
 @XmlRootElement(name = "user-group", namespace = CORE_XML_NS)
-public class Group extends Party implements Serializable {
+public class Group extends Party implements Serializable, Portable {
 
     private static final long serialVersionUID = -4800759206452780739L;
 
@@ -99,6 +101,7 @@ public class Group extends Party implements Serializable {
     @OneToMany(mappedBy = "group")
     @XmlElementWrapper(name = "group-memberships", namespace = CORE_XML_NS)
     @XmlElement(name = "group-membership", namespace = CORE_XML_NS)
+    @JsonManagedReference
     private Set<GroupMembership> memberships = new HashSet<>();
 
     public Group() {
diff --git a/ccm-core/src/main/java/org/libreccm/security/GroupMarshaller.java b/ccm-core/src/main/java/org/libreccm/security/GroupMarshaller.java
new file mode 100644
index 000000000..58afaab8f
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/security/GroupMarshaller.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2015 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.libreccm.security;
+
+import org.libreccm.portation.AbstractMarshaller;
+
+import javax.inject.Inject;
+
+/**
+ * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
+ * @version created on 11/7/16
+ */
+public class GroupMarshaller extends AbstractMarshaller<Group> {
+
+    @Inject
+    private GroupRepository groupRepository;
+
+    @Override
+    protected Class<Group> getObjectClass() {
+        return Group.class;
+    }
+
+    @Override
+    protected void insertIntoDb(Group portableObject) {
+        groupRepository.save(portableObject);
+    }
+}
diff --git a/ccm-core/src/main/java/org/libreccm/security/GroupMembership.java b/ccm-core/src/main/java/org/libreccm/security/GroupMembership.java
index f8cd0644b..9ba080bf1 100644
--- a/ccm-core/src/main/java/org/libreccm/security/GroupMembership.java
+++ b/ccm-core/src/main/java/org/libreccm/security/GroupMembership.java
@@ -18,6 +18,9 @@
  */
 package org.libreccm.security;
 
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import org.libreccm.portation.Portable;
+
 import static org.libreccm.core.CoreConstants.*;
 
 import java.io.Serializable;
@@ -50,7 +53,7 @@ import javax.xml.bind.annotation.XmlTransient;
                 query = "SELECT m FROM GroupMembership m "
                             + "WHERE m.member = :member AND m.group = :group")})
 @XmlRootElement(name = "group-membership", namespace = CORE_XML_NS)
-public class GroupMembership implements Serializable {
+public class GroupMembership implements Serializable, Portable {
 
     private static final long serialVersionUID = 83192968306850665L;
 
@@ -63,11 +66,13 @@ public class GroupMembership implements Serializable {
     @ManyToOne
     @JoinColumn(name = "GROUP_ID")
     @XmlTransient
+    @JsonBackReference
     private Group group;
 
     @ManyToOne
     @JoinColumn(name = "MEMBER_ID")
     @XmlTransient
+    @JsonBackReference
     private User member;
 
     public long getMembershipId() {
diff --git a/ccm-core/src/main/java/org/libreccm/security/GroupMembershipMarshaller.java b/ccm-core/src/main/java/org/libreccm/security/GroupMembershipMarshaller.java
new file mode 100644
index 000000000..a8b8dd026
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/security/GroupMembershipMarshaller.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2015 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.libreccm.security;
+
+import org.libreccm.portation.AbstractMarshaller;
+
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+
+/**
+ * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
+ * @version created on 11/7/16
+ */
+public class GroupMembershipMarshaller extends AbstractMarshaller<GroupMembership> {
+
+    @Inject
+    private EntityManager entityManager;
+
+    @Override
+    protected Class<GroupMembership> getObjectClass() {
+        return GroupMembership.class;
+    }
+
+    @Override
+    protected void insertIntoDb(GroupMembership portableObject) {
+        if (portableObject.getMembershipId() == 0) {
+            entityManager.persist(portableObject);
+        } else {
+            entityManager.merge(portableObject);
+        }
+    }
+}
diff --git a/ccm-core/src/main/java/org/libreccm/security/Party.java b/ccm-core/src/main/java/org/libreccm/security/Party.java
index 7f17420e2..e36be560e 100644
--- a/ccm-core/src/main/java/org/libreccm/security/Party.java
+++ b/ccm-core/src/main/java/org/libreccm/security/Party.java
@@ -20,7 +20,9 @@ package org.libreccm.security;
 
 import static org.libreccm.core.CoreConstants.*;
 
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 import org.libreccm.core.DefaultEntityGraph;
+import org.libreccm.portation.Portable;
 
 import java.io.Serializable;
 import java.util.Collections;
@@ -97,6 +99,7 @@ public class Party implements Serializable {
     @OneToMany(mappedBy = "member")
     @XmlElementWrapper(name = "role-memberships", namespace = CORE_XML_NS)
     @XmlElement(name = "role-membership", namespace = CORE_XML_NS)
+    @JsonManagedReference
     private Set<RoleMembership> roleMemberships = new HashSet<>();
 
     protected Party() {
diff --git a/ccm-core/src/main/java/org/libreccm/security/Permission.java b/ccm-core/src/main/java/org/libreccm/security/Permission.java
index c54286153..c92cb239d 100644
--- a/ccm-core/src/main/java/org/libreccm/security/Permission.java
+++ b/ccm-core/src/main/java/org/libreccm/security/Permission.java
@@ -18,13 +18,9 @@
  */
 package org.libreccm.security;
 
-import static org.libreccm.core.CoreConstants.*;
-
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import org.libreccm.core.CcmObject;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Objects;
+import org.libreccm.portation.Portable;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -35,7 +31,6 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
-import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
@@ -43,6 +38,12 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Objects;
+
+import static org.libreccm.core.CoreConstants.CORE_XML_NS;
+import static org.libreccm.core.CoreConstants.DB_SCHEMA;
 
 /**
  * A permission grants a privilege on an object or system wide to {@link Role}.
@@ -71,7 +72,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 })
 @XmlRootElement(name = "permission", namespace = CORE_XML_NS)
 @XmlAccessorType(XmlAccessType.FIELD)
-public class Permission implements Serializable {
+public class Permission implements Serializable, Portable {
 
     private static final long serialVersionUID = -5178045844045517958L;
 
@@ -94,8 +95,9 @@ public class Permission implements Serializable {
     /**
      * The object on which the privilege is granted. My be {@code null}.
      */
-    @OneToOne
+    @ManyToOne
     @JoinColumn(name = "OBJECT_ID")
+    @JsonBackReference
     private CcmObject object;
 
     /**
@@ -103,6 +105,7 @@ public class Permission implements Serializable {
      */
     @ManyToOne
     @JoinColumn(name = "GRANTEE_ID")
+    @JsonBackReference
     private Role grantee;
 
     /**
diff --git a/ccm-core/src/main/java/org/libreccm/security/PermissionMarshaller.java b/ccm-core/src/main/java/org/libreccm/security/PermissionMarshaller.java
new file mode 100644
index 000000000..63f408535
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/security/PermissionMarshaller.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2015 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.libreccm.security;
+
+import org.libreccm.portation.AbstractMarshaller;
+
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+
+/**
+ * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
+ * @version created on 11/7/16
+ */
+public class PermissionMarshaller extends AbstractMarshaller<Permission> {
+
+    @Inject
+    private EntityManager entityManager;
+
+    @Override
+    protected Class<Permission> getObjectClass() {
+        return Permission.class;
+    }
+
+    @Override
+    protected void insertIntoDb(Permission portableObject) {
+        if (portableObject.getPermissionId() == 0) {
+            entityManager.persist(portableObject);
+        } else {
+            entityManager.merge(portableObject);
+        }
+    }
+}
diff --git a/ccm-core/src/main/java/org/libreccm/security/Role.java b/ccm-core/src/main/java/org/libreccm/security/Role.java
index 8b4c18f7b..22bf8f3bc 100644
--- a/ccm-core/src/main/java/org/libreccm/security/Role.java
+++ b/ccm-core/src/main/java/org/libreccm/security/Role.java
@@ -18,22 +18,14 @@
  */
 package org.libreccm.security;
 
-import static org.libreccm.core.CoreConstants.*;
-
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 import org.hibernate.validator.constraints.NotBlank;
 import org.libreccm.core.DefaultEntityGraph;
 import org.libreccm.l10n.LocalizedString;
+import org.libreccm.portation.Portable;
 import org.libreccm.workflow.TaskAssignment;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
 import javax.persistence.AssociationOverride;
-
 import javax.persistence.Column;
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
@@ -55,6 +47,16 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+import static org.libreccm.core.CoreConstants.CORE_XML_NS;
+import static org.libreccm.core.CoreConstants.DB_SCHEMA;
 
 /**
  * A role is basically a collection a {@link Permission}s and {@code Task}s.
@@ -117,7 +119,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 @XmlRootElement(name = "role", namespace = CORE_XML_NS)
 @XmlAccessorType(XmlAccessType.FIELD)
 @SuppressWarnings({"PMD.ShortClassName", "PMD.TooManyMethods"})
-public class Role implements Serializable {
+public class Role implements Serializable, Portable {
 
     private static final long serialVersionUID = -7121296514181469687L;
 
@@ -148,6 +150,7 @@ public class Role implements Serializable {
     @OneToMany(mappedBy = "role")
     @XmlElementWrapper(name = "role-memberships", namespace = CORE_XML_NS)
     @XmlElement(name = "role-membership", namespace = CORE_XML_NS)
+    @JsonManagedReference
     private Set<RoleMembership> memberships = new HashSet<>();
 
     /**
@@ -156,9 +159,11 @@ public class Role implements Serializable {
     @OneToMany(mappedBy = "grantee")
     @XmlElementWrapper(name = "permissions", namespace = CORE_XML_NS)
     @XmlElement(name = "permission", namespace = CORE_XML_NS)
+    @JsonManagedReference
     private List<Permission> permissions = new ArrayList<>();
 
     @OneToMany(mappedBy = "role")
+    @JsonManagedReference
     private List<TaskAssignment> assignedTasks;
 
     /**
diff --git a/ccm-core/src/main/java/org/libreccm/security/RoleMarshaller.java b/ccm-core/src/main/java/org/libreccm/security/RoleMarshaller.java
new file mode 100644
index 000000000..024302276
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/security/RoleMarshaller.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2015 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.libreccm.security;
+
+import org.libreccm.portation.AbstractMarshaller;
+
+import javax.inject.Inject;
+
+/**
+ * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
+ * @version created on 11/7/16
+ */
+public class RoleMarshaller extends AbstractMarshaller<Role> {
+
+    @Inject
+    private RoleRepository roleRepository;
+
+    @Override
+    protected Class<Role> getObjectClass() {
+        return Role.class;
+    }
+
+    @Override
+    protected void insertIntoDb(Role portableObject) {
+        roleRepository.save(portableObject);
+    }
+}
diff --git a/ccm-core/src/main/java/org/libreccm/security/RoleMembership.java b/ccm-core/src/main/java/org/libreccm/security/RoleMembership.java
index 7414b5439..420512f5c 100644
--- a/ccm-core/src/main/java/org/libreccm/security/RoleMembership.java
+++ b/ccm-core/src/main/java/org/libreccm/security/RoleMembership.java
@@ -18,6 +18,9 @@
  */
 package org.libreccm.security;
 
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import org.libreccm.portation.Portable;
+
 import static org.libreccm.core.CoreConstants.*;
 
 import java.io.Serializable;
@@ -51,7 +54,7 @@ import javax.xml.bind.annotation.XmlTransient;
                             + "WHERE m.member = :member AND m.role = :role")
 })
 @XmlRootElement(name = "role-membership", namespace = CORE_XML_NS)
-public class RoleMembership implements Serializable {
+public class RoleMembership implements Serializable, Portable {
 
     private static final long serialVersionUID = -3049727720697964793L;
 
@@ -64,11 +67,13 @@ public class RoleMembership implements Serializable {
     @ManyToOne
     @JoinColumn(name = "ROLE_ID")
     @XmlTransient
+    @JsonBackReference
     private Role role;
 
     @ManyToOne
     @JoinColumn(name = "MEMBER_ID")
     @XmlTransient
+    @JsonBackReference
     private Party member;
 
     public long getMembershipId() {
diff --git a/ccm-core/src/main/java/org/libreccm/security/RoleMembershipMarshaller.java b/ccm-core/src/main/java/org/libreccm/security/RoleMembershipMarshaller.java
new file mode 100644
index 000000000..10263bbcc
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/security/RoleMembershipMarshaller.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2015 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.libreccm.security;
+
+import org.libreccm.portation.AbstractMarshaller;
+
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+
+/**
+ * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
+ * @version created on 11/7/16
+ */
+public class RoleMembershipMarshaller extends AbstractMarshaller<RoleMembership> {
+
+    @Inject
+    private EntityManager entityManager;
+
+    @Override
+    protected Class<RoleMembership> getObjectClass() {
+        return RoleMembership.class;
+    }
+
+    @Override
+    protected void insertIntoDb(RoleMembership portableObject) {
+        if (portableObject.getMembershipId() == 0) {
+            entityManager.persist(portableObject);
+        } else {
+            entityManager.merge(portableObject);
+        }
+    }
+}
diff --git a/ccm-core/src/main/java/org/libreccm/security/User.java b/ccm-core/src/main/java/org/libreccm/security/User.java
index 8436b110d..3c741b0e9 100644
--- a/ccm-core/src/main/java/org/libreccm/security/User.java
+++ b/ccm-core/src/main/java/org/libreccm/security/User.java
@@ -20,8 +20,10 @@ package org.libreccm.security;
 
 import static org.libreccm.core.CoreConstants.*;
 
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 import org.libreccm.core.DefaultEntityGraph;
 import org.libreccm.core.EmailAddress;
+import org.libreccm.portation.Portable;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -125,7 +127,7 @@ import javax.xml.bind.annotation.XmlTransient;
 //Supressing a few warnings from PMD because they misleading here.
 //User is perfectly fine class name, and the complexity is not to high...
 @SuppressWarnings({"PMD.ShortClassName", "PMD.LongVariable"})
-public class User extends Party implements Serializable {
+public class User extends Party implements Serializable, Portable {
 
     private static final long serialVersionUID = 4035223413596611393L;
 
@@ -202,6 +204,7 @@ public class User extends Party implements Serializable {
     @OneToMany(mappedBy = "member")
     @XmlElementWrapper(name = "group-memberships", namespace = CORE_XML_NS)
     @XmlElement(name = "group-membership", namespace = CORE_XML_NS)
+    @JsonManagedReference
     private Set<GroupMembership> groupMemberships = new HashSet<>();
 
     protected User() {
diff --git a/ccm-core/src/main/java/org/libreccm/security/UserMarshaller.java b/ccm-core/src/main/java/org/libreccm/security/UserMarshaller.java
new file mode 100644
index 000000000..51b93cc16
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/security/UserMarshaller.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2015 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.libreccm.security;
+
+import org.libreccm.portation.AbstractMarshaller;
+
+import javax.inject.Inject;
+
+/**
+ * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
+ * @version created on 11/7/16
+ */
+public class UserMarshaller extends AbstractMarshaller<User> {
+
+    @Inject
+    private UserRepository userRepository;
+
+    @Override
+    protected Class<User> getObjectClass() {
+        return User.class;
+    }
+
+    @Override
+    protected void insertIntoDb(User portableObject) {
+        userRepository.save(portableObject);
+    }
+}
diff --git a/ccm-core/src/main/java/org/libreccm/workflow/AssignableTask.java b/ccm-core/src/main/java/org/libreccm/workflow/AssignableTask.java
index 2c4f601cc..32de54918 100644
--- a/ccm-core/src/main/java/org/libreccm/workflow/AssignableTask.java
+++ b/ccm-core/src/main/java/org/libreccm/workflow/AssignableTask.java
@@ -20,6 +20,8 @@ package org.libreccm.workflow;
 
 import static org.libreccm.core.CoreConstants.*;
 
+import com.fasterxml.jackson.annotation.JsonManagedReference;
+import org.libreccm.portation.Portable;
 import org.libreccm.security.User;
 
 import java.io.Serializable;
@@ -79,7 +81,7 @@ import javax.persistence.TemporalType;
 @SuppressWarnings({"PMD.CyclomaticComplexity",
                    "PMD.StdCyclomaticComplexity",
                    "PMD.ModifiedCyclomaticComplexity"})
-public class AssignableTask extends Task implements Serializable {
+public class AssignableTask extends Task implements Serializable, Portable {
 
     private static final long serialVersionUID = 4188064584389893019L;
 
@@ -128,6 +130,7 @@ public class AssignableTask extends Task implements Serializable {
      * The roles to which task is assigned.
      */
     @OneToMany(mappedBy = "task")
+    @JsonManagedReference
     private List<TaskAssignment> assignments;
 
     public AssignableTask() {
diff --git a/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskMarshaller.java b/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskMarshaller.java
new file mode 100644
index 000000000..ce452f808
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskMarshaller.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2015 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.libreccm.workflow;
+
+import org.libreccm.portation.AbstractMarshaller;
+
+import javax.inject.Inject;
+
+/**
+ * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
+ * @version created on 11/18/16
+ */
+public class AssignableTaskMarshaller extends AbstractMarshaller<AssignableTask> {
+
+    @Inject
+    private AssignableTaskRepository assignableTaskRepository;
+
+    @Override
+    protected Class<AssignableTask> getObjectClass() {
+        return AssignableTask.class;
+    }
+
+    @Override
+    protected void insertIntoDb(AssignableTask portableObject) {
+        assignableTaskRepository.save(portableObject);
+    }
+}
diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignment.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignment.java
index 7ebbdebd6..879ca0cde 100644
--- a/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignment.java
+++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignment.java
@@ -20,6 +20,8 @@ package org.libreccm.workflow;
 
 import static org.libreccm.core.CoreConstants.*;
 
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import org.libreccm.portation.Portable;
 import org.libreccm.security.Role;
 
 import java.io.Serializable;
@@ -41,7 +43,7 @@ import javax.persistence.Table;
  */
 @Entity
 @Table(name = "WORKFLOW_TASK_ASSIGNMENTS", schema = DB_SCHEMA)
-public class TaskAssignment implements Serializable {
+public class TaskAssignment implements Serializable, Portable {
 
     private static final long serialVersionUID = -4427537363301565707L;
 
@@ -58,6 +60,7 @@ public class TaskAssignment implements Serializable {
      */
     @ManyToOne
     @JoinColumn(name = "TASK_ID")
+    @JsonBackReference
     private AssignableTask task;
 
     /**
@@ -65,6 +68,7 @@ public class TaskAssignment implements Serializable {
      */
     @ManyToOne
     @JoinColumn(name = "ROLE_ID")
+    @JsonBackReference
     private Role role;
 
     public long getTaskAssignmentId() {
diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentMarshaller.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentMarshaller.java
new file mode 100644
index 000000000..5a39d987b
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskAssignmentMarshaller.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2015 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.libreccm.workflow;
+
+import org.libreccm.portation.AbstractMarshaller;
+
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+
+/**
+ * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
+ * @version created on 11/7/16
+ */
+public class TaskAssignmentMarshaller extends AbstractMarshaller<TaskAssignment> {
+
+    @Inject
+    private EntityManager entityManager;
+
+    @Override
+    protected Class<TaskAssignment> getObjectClass() {
+        return TaskAssignment.class;
+    }
+
+    @Override
+    protected void insertIntoDb(TaskAssignment portableObject) {
+        if (portableObject.getTaskAssignmentId() == 0) {
+            entityManager.persist(portableObject);
+        } else {
+            entityManager.merge(portableObject);
+        }
+    }
+}
diff --git a/ccm-core/src/main/java/org/libreccm/workflow/Workflow.java b/ccm-core/src/main/java/org/libreccm/workflow/Workflow.java
index 3c802eb7b..e617468da 100644
--- a/ccm-core/src/main/java/org/libreccm/workflow/Workflow.java
+++ b/ccm-core/src/main/java/org/libreccm/workflow/Workflow.java
@@ -50,6 +50,7 @@ import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 import org.libreccm.core.Identifiable;
+import org.libreccm.portation.Portable;
 
 /**
  * A workflow is a collection of tasks which are performed on an object. Tasks
@@ -66,7 +67,7 @@ import org.libreccm.core.Identifiable;
         query = "SELECT w FROM Workflow w "
                     + "WHERE W.object = :object")
 })
-public class Workflow implements Identifiable, Serializable {
+public class Workflow implements Identifiable, Serializable, Portable {
 
     private static final long serialVersionUID = 4322500264543325829L;
 
@@ -86,7 +87,7 @@ public class Workflow implements Identifiable, Serializable {
     private String uuid;
 
     /**
-     * The template which was used the generate the workflow.
+     * The template which was used to generate the workflow.
      */
     @ManyToOne
     @JoinColumn(name = "TEMPLATE_ID")
@@ -132,8 +133,8 @@ public class Workflow implements Identifiable, Serializable {
 
     /**
      * The task state of the workflow. This field is a leftover from the old
-     * implementation of workflow were workflow extended {@link Task}. Because
-     * we wanted to keep the basic logic this field is here.
+     * implementation of workflow were workflow extended {@link Task}. This
+     * field is here because we wanted to keep the basic logic.
      */
     @Column(name = "TASKS_STATE")
     @Enumerated(EnumType.STRING)
diff --git a/ccm-core/src/main/java/org/libreccm/workflow/WorkflowMarshaller.java b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowMarshaller.java
new file mode 100644
index 000000000..aece9259c
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowMarshaller.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2015 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.libreccm.workflow;
+
+import org.libreccm.portation.AbstractMarshaller;
+
+import javax.inject.Inject;
+
+/**
+ * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
+ * @version created on 11/7/16
+ */
+public class WorkflowMarshaller extends AbstractMarshaller<Workflow> {
+
+    @Inject
+    private WorkflowRepository workflowRepository;
+
+    @Override
+    protected Class<Workflow> getObjectClass() {
+        return Workflow.class;
+    }
+
+    @Override
+    protected void insertIntoDb(Workflow portableObject) {
+        workflowRepository.save(portableObject);
+    }
+}
diff --git a/ccm-core/src/main/java/org/libreccm/workflow/WorkflowTemplate.java b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowTemplate.java
index 9a3477915..068eb31b6 100644
--- a/ccm-core/src/main/java/org/libreccm/workflow/WorkflowTemplate.java
+++ b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowTemplate.java
@@ -18,14 +18,14 @@
  */
 package org.libreccm.workflow;
 
-import static org.libreccm.core.CoreConstants.*;
-
 import org.libreccm.core.CcmObject;
-
-import java.io.Serializable;
+import org.libreccm.portation.Portable;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
+
+import static org.libreccm.core.CoreConstants.DB_SCHEMA;
 
 /**
  * Objects of these class are used as templates for new workflows. The tasks 
@@ -35,14 +35,16 @@ import javax.persistence.Table;
  */
 @Entity
 @Table(name = "WORKFLOW_TEMPLATES", schema = DB_SCHEMA)
-public class WorkflowTemplate extends Workflow implements Serializable {
+public class WorkflowTemplate extends Workflow implements Serializable,
+        Portable {
 
     private static final long serialVersionUID = 5770519379144947171L;
 
     /**
-     * A workflow template has no object. Therefore the {@code setObject(CcmObject)
-     * method has been overwritten the throw an {@link UnsupportedOperationException} 
-     * when called on the workflow template.
+     * A workflow template has no object. Therefore the {@code setObject
+     * (CcmObject)} method has been overwritten to throw an
+     * {@link UnsupportedOperationException} when called on the workflow
+     * template.
      * 
      * @param object 
      */
diff --git a/ccm-core/src/main/java/org/libreccm/workflow/WorkflowTemplateMarshaller.java b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowTemplateMarshaller.java
new file mode 100644
index 000000000..1cae65498
--- /dev/null
+++ b/ccm-core/src/main/java/org/libreccm/workflow/WorkflowTemplateMarshaller.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2015 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.libreccm.workflow;
+
+import org.libreccm.portation.AbstractMarshaller;
+
+import javax.inject.Inject;
+
+/**
+ * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
+ * @version created on 11/21/16
+ */
+public class WorkflowTemplateMarshaller extends
+        AbstractMarshaller<WorkflowTemplate> {
+
+    @Inject
+    private WorkflowTemplateRepository workflowTemplateRepository;
+
+    @Override
+    protected Class<WorkflowTemplate> getObjectClass() {
+        return WorkflowTemplate.class;
+    }
+
+    @Override
+    protected void insertIntoDb(WorkflowTemplate portableObject) {
+        workflowTemplateRepository.save(portableObject);
+    }
+}
diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/AbstractResource.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/AbstractResource.java
index ef944d778..96cec0dcb 100644
--- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/AbstractResource.java
+++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/AbstractResource.java
@@ -21,6 +21,7 @@ package org.libreccm.docrepo;
 import org.apache.log4j.Logger;
 import org.hibernate.validator.constraints.NotBlank;
 import org.libreccm.core.CcmObject;
+import org.libreccm.portation.Portable;
 import org.libreccm.security.User;
 
 import javax.persistence.Column;
@@ -45,7 +46,8 @@ import java.util.Date;
  */
 @Entity
 @Table(schema = "CCM_DOCREPO", name = "RESOURCES")
-public abstract class AbstractResource extends CcmObject {
+public abstract class AbstractResource extends CcmObject implements Portable {
+
     private static final Logger log = Logger.getLogger(AbstractResource.class);
 
     private static final long serialVersionUID = -910317798106611214L;
diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObject.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObject.java
index 8fcd3e6e0..8848de14b 100644
--- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObject.java
+++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObject.java
@@ -21,6 +21,7 @@ package org.libreccm.docrepo;
 
 import org.hibernate.validator.constraints.NotEmpty;
 import org.libreccm.core.Identifiable;
+import org.libreccm.portation.Portable;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -46,7 +47,7 @@ import java.util.Objects;
  */
 @Entity
 @Table(schema = "CCM_DOCREPO", name = "BLOB_OBJECTS")
-public class BlobObject implements Identifiable, Serializable {
+public class BlobObject implements Identifiable, Serializable, Portable {
 
     private static final long serialVersionUID = -7468014879548796218L;
 
diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObjectMarshaller.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObjectMarshaller.java
index 74b2c49cd..96d94e012 100644
--- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObjectMarshaller.java
+++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/BlobObjectMarshaller.java
@@ -44,7 +44,7 @@ public class BlobObjectMarshaller extends AbstractMarshaller<BlobObject> {
     }
 
     @Override
-    protected void insertIntoDb(BlobObject object) {
-        blobObjectRepository.save(object);
+    protected void insertIntoDb(BlobObject portableObject) {
+        blobObjectRepository.save(portableObject);
     }
 }
diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/FileMarshaller.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/FileMarshaller.java
index 564114c6a..dd7c9f5c7 100644
--- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/FileMarshaller.java
+++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/FileMarshaller.java
@@ -44,7 +44,7 @@ public class FileMarshaller extends AbstractResourceMarshaller<File> {
     }
 
     @Override
-    protected void insertIntoDb(File object) {
-        fileRepository.save(object);
+    protected void insertIntoDb(File portableObject) {
+        fileRepository.save(portableObject);
     }
 }
diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/FolderMarshaller.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/FolderMarshaller.java
index 3ee00a000..517d771ee 100644
--- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/FolderMarshaller.java
+++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/FolderMarshaller.java
@@ -43,7 +43,7 @@ public class FolderMarshaller extends AbstractResourceMarshaller<Folder> {
     }
 
     @Override
-    protected void insertIntoDb(Folder object) {
-        folderRepository.save(object);
+    protected void insertIntoDb(Folder portableObject) {
+        folderRepository.save(portableObject);
     }
 }
diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/Repository.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/Repository.java
index 5612b3c40..1ad2460ca 100644
--- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/Repository.java
+++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/Repository.java
@@ -19,6 +19,7 @@
 package org.libreccm.docrepo;
 
 import org.hibernate.validator.constraints.NotBlank;
+import org.libreccm.portation.Portable;
 import org.libreccm.security.User;
 import org.libreccm.web.CcmApplication;
 
@@ -45,7 +46,7 @@ import java.util.List;
         @NamedQuery(name = "DocRepo.findRepositoriesForOwner",
                     query = "SELECT r FROM Repository r WHERE r.owner = :owner")
 })
-public class Repository extends CcmApplication {
+public class Repository extends CcmApplication implements Portable {
 
     private static final long serialVersionUID = 6673243021462798036L;
 
diff --git a/ccm-docrepo/src/main/java/org/libreccm/docrepo/RepositoryMarshaller.java b/ccm-docrepo/src/main/java/org/libreccm/docrepo/RepositoryMarshaller.java
index 424f3499c..adc74dbbf 100644
--- a/ccm-docrepo/src/main/java/org/libreccm/docrepo/RepositoryMarshaller.java
+++ b/ccm-docrepo/src/main/java/org/libreccm/docrepo/RepositoryMarshaller.java
@@ -41,7 +41,7 @@ public class RepositoryMarshaller extends AbstractMarshaller<Repository> {
     }
 
     @Override
-    protected void insertIntoDb(Repository object) {
-        repositoryRepository.save(object);
+    protected void insertIntoDb(Repository portableObject) {
+        repositoryRepository.save(portableObject);
     }
 }
diff --git a/ccm-docrepo/src/test/resources/datasets/org/libreccm/docrepo/FilePortationTest/test2.xml b/ccm-docrepo/src/test/resources/datasets/org/libreccm/docrepo/FilePortationTest/test2.xml
index becdfe6b5..5ea1e7e53 100644
--- a/ccm-docrepo/src/test/resources/datasets/org/libreccm/docrepo/FilePortationTest/test2.xml
+++ b/ccm-docrepo/src/test/resources/datasets/org/libreccm/docrepo/FilePortationTest/test2.xml
@@ -1 +1 @@
-<File><objectId>1</objectId><uuid>bcf940f3-c43a-47da-a029-4ee136757a01</uuid><displayName/><name>testname</name><description>this is a text description</description><path>/home/tosmers/Svn/libreccm/ccm_ng/ccm-docrepo/src/test/resources/datasets/org/libreccm/docrepo/FilePortationTest/filename.txt</path><mimeType/><size>0</size><creationDate>1461836103332</creationDate><lastModifiedDate>1461836103332</lastModifiedDate><creationIp/><lastModifiedIp/><creationUser/><lastModifiedUser/><parent/><repository/><content/></File>
+<File><objectId>1</objectId><uuid>3edb95ff-85cc-4af8-aa30-92e4029bfe57</uuid><displayName/><name>testname</name><description>this is a text description</description><path>/home/tosmers/Svn/libreccm/ccm_ng/ccm-docrepo/src/test/resources/datasets/org/libreccm/docrepo/FilePortationTest/filename.txt</path><mimeType/><size>0</size><creationDate>1476719581162</creationDate><lastModifiedDate>1476719581162</lastModifiedDate><creationIp/><lastModifiedIp/><creationUser/><lastModifiedUser/><parent/><repository/><content/></File>
diff --git a/ccm-docrepo/src/test/resources/datasets/org/libreccm/docrepo/FilePortationTest/test3.xml b/ccm-docrepo/src/test/resources/datasets/org/libreccm/docrepo/FilePortationTest/test3.xml
index 52c35fa49..9a570021b 100644
--- a/ccm-docrepo/src/test/resources/datasets/org/libreccm/docrepo/FilePortationTest/test3.xml
+++ b/ccm-docrepo/src/test/resources/datasets/org/libreccm/docrepo/FilePortationTest/test3.xml
@@ -1,14 +1,14 @@
 <File>
   <objectId>1</objectId>
-  <uuid>bcf940f3-c43a-47da-a029-4ee136757a01</uuid>
+  <uuid>3edb95ff-85cc-4af8-aa30-92e4029bfe57</uuid>
   <displayName/>
   <name>testname</name>
   <description>this is a text description</description>
   <path>/home/tosmers/Svn/libreccm/ccm_ng/ccm-docrepo/src/test/resources/datasets/org/libreccm/docrepo/FilePortationTest/filename.txt</path>
   <mimeType/>
   <size>0</size>
-  <creationDate>1461836103332</creationDate>
-  <lastModifiedDate>1461836103332</lastModifiedDate>
+  <creationDate>1476719581162</creationDate>
+  <lastModifiedDate>1476719581162</lastModifiedDate>
   <creationIp/>
   <lastModifiedIp/>
   <creationUser/>
diff --git a/ccm-docrepo/src/test/resources/datasets/org/libreccm/docrepo/FilePortationTest/test4.xml b/ccm-docrepo/src/test/resources/datasets/org/libreccm/docrepo/FilePortationTest/test4.xml
index 52c35fa49..9a570021b 100644
--- a/ccm-docrepo/src/test/resources/datasets/org/libreccm/docrepo/FilePortationTest/test4.xml
+++ b/ccm-docrepo/src/test/resources/datasets/org/libreccm/docrepo/FilePortationTest/test4.xml
@@ -1,14 +1,14 @@
 <File>
   <objectId>1</objectId>
-  <uuid>bcf940f3-c43a-47da-a029-4ee136757a01</uuid>
+  <uuid>3edb95ff-85cc-4af8-aa30-92e4029bfe57</uuid>
   <displayName/>
   <name>testname</name>
   <description>this is a text description</description>
   <path>/home/tosmers/Svn/libreccm/ccm_ng/ccm-docrepo/src/test/resources/datasets/org/libreccm/docrepo/FilePortationTest/filename.txt</path>
   <mimeType/>
   <size>0</size>
-  <creationDate>1461836103332</creationDate>
-  <lastModifiedDate>1461836103332</lastModifiedDate>
+  <creationDate>1476719581162</creationDate>
+  <lastModifiedDate>1476719581162</lastModifiedDate>
   <creationIp/>
   <lastModifiedIp/>
   <creationUser/>