diff --git a/ccm-core/src/com/arsdigita/portation/cmd/ExportHelper.java b/ccm-core/src/com/arsdigita/portation/cmd/ExportHelper.java index cb63aa996..0d50102c3 100644 --- a/ccm-core/src/com/arsdigita/portation/cmd/ExportHelper.java +++ b/ccm-core/src/com/arsdigita/portation/cmd/ExportHelper.java @@ -44,7 +44,9 @@ import java.util.ArrayList; */ class ExportHelper { - private static String pathName = "/home/tosmers/Downloads/test-exports"; + private static String pathName = + "/home/tosmers/Svn/libreccm/ccm_ng/ccm-core/src/test/resources/" + + "portation/trunk-iaw-exports"; private static boolean indentation = false; static void exportCategories() { diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/categorization/Categorization.java b/ccm-core/src/com/arsdigita/portation/modules/core/categorization/Categorization.java index 93ea0bb4d..525a18264 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/categorization/Categorization.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/categorization/Categorization.java @@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller; import com.arsdigita.portation.Portable; import com.arsdigita.portation.conversion.NgCollection; import com.arsdigita.portation.modules.core.core.CcmObject; -import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonManagedReference; /** * Association class describing the association between a category and an @@ -36,9 +36,9 @@ public class Categorization implements Portable { private long categorizationId; - @JsonBackReference + @JsonManagedReference private Category category; - @JsonBackReference + @JsonManagedReference private CcmObject categorizedObject; private boolean index; diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/categorization/Category.java b/ccm-core/src/com/arsdigita/portation/modules/core/categorization/Category.java index 2129a1578..4d83eb4af 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/categorization/Category.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/categorization/Category.java @@ -56,12 +56,12 @@ public class Category extends CcmObject implements Portable { private boolean visible; private boolean abstractCategory; - @JsonManagedReference + @JsonBackReference private List objects; - @JsonManagedReference - private List subCategories; @JsonBackReference + private List subCategories; + @JsonManagedReference private Category parentCategory; private long categoryOrder; diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/core/CcmObject.java b/ccm-core/src/com/arsdigita/portation/modules/core/core/CcmObject.java index 5ec8116b7..638d0baff 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/core/CcmObject.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/core/CcmObject.java @@ -23,7 +23,7 @@ import com.arsdigita.portation.conversion.NgCollection; import com.arsdigita.portation.modules.core.categorization.Categorization; import com.arsdigita.portation.modules.core.categorization.Category; import com.arsdigita.portation.modules.core.security.Permission; -import com.fasterxml.jackson.annotation.JsonManagedReference; +import com.fasterxml.jackson.annotation.JsonBackReference; import java.util.ArrayList; import java.util.List; @@ -53,9 +53,9 @@ public class CcmObject { private String uuid; private String displayName; - @JsonManagedReference + @JsonBackReference private List permissions; - @JsonManagedReference + @JsonBackReference private List categories; diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/Group.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/Group.java index e96fb92e9..c7ecd9427 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/security/Group.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/Group.java @@ -21,7 +21,7 @@ package com.arsdigita.portation.modules.core.security; import com.arsdigita.portation.AbstractMarshaller; import com.arsdigita.portation.Portable; import com.arsdigita.portation.conversion.NgCollection; -import com.fasterxml.jackson.annotation.JsonManagedReference; +import com.fasterxml.jackson.annotation.JsonBackReference; import java.util.HashSet; import java.util.Set; @@ -32,7 +32,7 @@ import java.util.Set; */ public class Group extends Party implements Portable { - @JsonManagedReference + @JsonBackReference private Set memberships; public Group(final com.arsdigita.kernel.Group trunkGroup) { diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/GroupMembership.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/GroupMembership.java index a3621f7f3..b267a4fb0 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/security/GroupMembership.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/GroupMembership.java @@ -21,7 +21,7 @@ package com.arsdigita.portation.modules.core.security; import com.arsdigita.portation.AbstractMarshaller; import com.arsdigita.portation.Portable; import com.arsdigita.portation.conversion.NgCollection; -import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonManagedReference; /** * @author Tobias Osmers<\a> @@ -31,9 +31,9 @@ public class RoleMembership implements Portable { private long membershipId; - @JsonBackReference + @JsonManagedReference private Role role; - @JsonBackReference + @JsonManagedReference private Party member; public RoleMembership(final Role role, final Party member) { diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/User.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/User.java index fe3ac3c31..1f89dcf15 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/security/User.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/User.java @@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller; import com.arsdigita.portation.Portable; import com.arsdigita.portation.conversion.NgCollection; import com.arsdigita.portation.modules.core.core.EmailAddress; -import com.fasterxml.jackson.annotation.JsonManagedReference; +import com.fasterxml.jackson.annotation.JsonBackReference; import java.util.ArrayList; import java.util.HashSet; @@ -46,7 +46,7 @@ public class User extends Party implements Portable { private String password; private boolean passwordResetRequired; - @JsonManagedReference + @JsonBackReference private Set groupMemberships; public User(final com.arsdigita.kernel.User trunkUser) { diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/workflow/AssignableTask.java b/ccm-core/src/com/arsdigita/portation/modules/core/workflow/AssignableTask.java index bf56bdbed..76abfc323 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/workflow/AssignableTask.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/workflow/AssignableTask.java @@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller; import com.arsdigita.portation.Portable; import com.arsdigita.portation.conversion.NgCollection; import com.arsdigita.portation.modules.core.security.User; -import com.fasterxml.jackson.annotation.JsonManagedReference; +import com.fasterxml.jackson.annotation.JsonBackReference; import java.util.ArrayList; import java.util.Date; @@ -43,7 +43,7 @@ public class AssignableTask extends Task implements Portable { private User notificationSender; - @JsonManagedReference + @JsonBackReference private List assignments; public AssignableTask(final com.arsdigita.workflow.simple.UserTask diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/workflow/Task.java b/ccm-core/src/com/arsdigita/portation/modules/core/workflow/Task.java index b07f0f6a4..c5233e3a6 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/workflow/Task.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/workflow/Task.java @@ -44,7 +44,7 @@ public class Task { private boolean active; private TaskState taskState; - @JsonBackReference + @JsonManagedReference private Workflow workflow; @JsonBackReference diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/workflow/TaskAssignment.java b/ccm-core/src/com/arsdigita/portation/modules/core/workflow/TaskAssignment.java index da765a988..6a7c379dd 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/workflow/TaskAssignment.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/workflow/TaskAssignment.java @@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller; import com.arsdigita.portation.Portable; import com.arsdigita.portation.conversion.NgCollection; import com.arsdigita.portation.modules.core.security.Role; -import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonManagedReference; /** * @author