LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[UPDATE] 

- modifies managed/back references

git-svn-id: https://svn.libreccm.org/ccm/trunk@4471 8810af33-2d31-482b-a856-94f89814c4df
master
tosmers 2016-12-12 18:40:26 +00:00
parent fe2fa3048f
commit e9ab7077d9
15 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-core/src/com/arsdigita/portation/cmd/ExportHelper.java
View File

@ -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() {

6
ccm-core/src/com/arsdigita/portation/modules/core/categorization/Categorization.java
View File

@ -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;

6
ccm-core/src/com/arsdigita/portation/modules/core/categorization/Category.java
View File

@ -56,12 +56,12 @@ public class Category extends CcmObject implements Portable {
private boolean visible;
private boolean abstractCategory;
@JsonManagedReference
@JsonBackReference
private List<Categorization> objects;
@JsonManagedReference
private List<Category> subCategories;
@JsonBackReference
private List<Category> subCategories;
@JsonManagedReference
private Category parentCategory;
private long categoryOrder;

6
ccm-core/src/com/arsdigita/portation/modules/core/core/CcmObject.java
View File

@ -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<Permission> permissions;
@JsonManagedReference
@JsonBackReference
private List<Categorization> categories;

4
ccm-core/src/com/arsdigita/portation/modules/core/security/Group.java
View File

@ -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<GroupMembership> memberships;
public Group(final com.arsdigita.kernel.Group trunkGroup) {

6
ccm-core/src/com/arsdigita/portation/modules/core/security/GroupMembership.java
View File

@ -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 <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
@ -31,9 +31,9 @@ public class GroupMembership implements Portable {
private long membershipId;
@JsonBackReference
@JsonManagedReference
private Group group;
@JsonBackReference
@JsonManagedReference
private User member;
public GroupMembership(final Group group, final User member) {

4
ccm-core/src/com/arsdigita/portation/modules/core/security/Party.java
View File

@ -19,7 +19,7 @@
package com.arsdigita.portation.modules.core.security;
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;
@ -33,7 +33,7 @@ public class Party {
private long partyId;
private String name;
@JsonManagedReference
@JsonBackReference
private Set<RoleMembership> roleMemberships;
public Party(final com.arsdigita.kernel.Party trunkParty) {

6
ccm-core/src/com/arsdigita/portation/modules/core/security/Permission.java
View File

@ -23,7 +23,7 @@ import com.arsdigita.portation.Portable;
import com.arsdigita.portation.conversion.NgCollection;
import com.arsdigita.portation.modules.core.core.CcmObject;
import com.arsdigita.portation.modules.core.security.util.PermissionIdMapper;
import com.fasterxml.jackson.annotation.JsonBackReference;
import com.fasterxml.jackson.annotation.JsonManagedReference;
import java.math.BigDecimal;
import java.util.Date;
@ -37,9 +37,9 @@ public class Permission implements Portable {
private long permissionId;
private String grantedPrivilege;
@JsonBackReference
@JsonManagedReference
private CcmObject object;
@JsonBackReference
@JsonManagedReference
private Role grantee;
private User creationUser;

8
ccm-core/src/com/arsdigita/portation/modules/core/security/Role.java
View File

@ -23,7 +23,7 @@ import com.arsdigita.portation.Portable;
import com.arsdigita.portation.conversion.NgCollection;
import com.arsdigita.portation.modules.core.l10n.LocalizedString;
import com.arsdigita.portation.modules.core.workflow.TaskAssignment;
import com.fasterxml.jackson.annotation.JsonManagedReference;
import com.fasterxml.jackson.annotation.JsonBackReference;
import java.util.ArrayList;
import java.util.HashSet;
@ -40,11 +40,11 @@ public class Role implements Portable {
private long roleId;
private String name;
@JsonManagedReference
@JsonBackReference
private Set<RoleMembership> memberships;
@JsonManagedReference
@JsonBackReference
private List<Permission> permissions;
@JsonManagedReference
@JsonBackReference
private List<TaskAssignment> assignedTasks;
private LocalizedString description;

6
ccm-core/src/com/arsdigita/portation/modules/core/security/RoleMembership.java
View File

@ -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 <a href="mailto:tosmers@uni-bremen.de>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) {

4
ccm-core/src/com/arsdigita/portation/modules/core/security/User.java
View File

@ -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<GroupMembership> groupMemberships;
public User(final com.arsdigita.kernel.User trunkUser) {

4
ccm-core/src/com/arsdigita/portation/modules/core/workflow/AssignableTask.java
View File

@ -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<TaskAssignment> assignments;
public AssignableTask(final com.arsdigita.workflow.simple.UserTask

2
ccm-core/src/com/arsdigita/portation/modules/core/workflow/Task.java
View File

@ -44,7 +44,7 @@ public class Task {
private boolean active;
private TaskState taskState;
@JsonBackReference
@JsonManagedReference
private Workflow workflow;
@JsonBackReference

6
ccm-core/src/com/arsdigita/portation/modules/core/workflow/TaskAssignment.java
View File

@ -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 <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers<\a>
@ -32,9 +32,9 @@ public class TaskAssignment implements Portable {
private long taskAssignmentId;
@JsonBackReference
@JsonManagedReference
private AssignableTask task;
@JsonBackReference
@JsonManagedReference
private Role role;
public TaskAssignment(final AssignableTask task, final Role role) {

4
ccm-core/src/com/arsdigita/portation/modules/core/workflow/Workflow.java
View File

@ -24,7 +24,7 @@ import com.arsdigita.portation.conversion.NgCollection;
import com.arsdigita.portation.modules.core.core.CcmObject;
import com.arsdigita.portation.modules.core.l10n.LocalizedString;
import com.arsdigita.portation.modules.core.workflow.util.StateMapper;
import com.fasterxml.jackson.annotation.JsonManagedReference;
import com.fasterxml.jackson.annotation.JsonBackReference;
import java.util.ArrayList;
import java.util.List;
@ -51,7 +51,7 @@ public class Workflow implements Portable {
private CcmObject object;
@JsonManagedReference
@JsonBackReference
private List<Task> tasks;