diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/core/EmailAddress.java b/ccm-core/src/com/arsdigita/portation/modules/core/core/EmailAddress.java index cab977d2c..0ba36f675 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/core/EmailAddress.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/core/EmailAddress.java @@ -27,8 +27,6 @@ import com.arsdigita.portation.Identifiable; */ public class EmailAddress implements Identifiable { - private String trunkClass; - private String address; private boolean bouncing; private boolean verified; @@ -38,16 +36,6 @@ public class EmailAddress implements Identifiable { } - @Override - public String getTrunkClass() { - return this.trunkClass; - } - - @Override - public void setTrunkClass(String trunkClass) { - this.trunkClass = trunkClass; - } - @Override public AbstractMarshaller getMarshaller() { return new EmailAddressMarshaller(); 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 e2fc1c698..f9d493941 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 @@ -27,8 +27,6 @@ import com.arsdigita.portation.Identifiable; */ public class GroupMembership implements Identifiable { - private String trunkClass; - private long membershipId; private Group group; private User member; @@ -38,16 +36,6 @@ public class GroupMembership implements Identifiable { } - @Override - public String getTrunkClass() { - return this.trunkClass; - } - - @Override - public void setTrunkClass(String trunkClass) { - this.trunkClass = trunkClass; - } - @Override public AbstractMarshaller getMarshaller() { return new GroupMembershipMarshaller(); diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/Party.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/Party.java index 1fb9f2673..5587348a6 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/security/Party.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/Party.java @@ -30,8 +30,6 @@ import java.util.Set; */ public class Party implements Identifiable { - private String trunkClass; - private long partyId; private String name; private Set roleMemberships = new HashSet<>(); @@ -41,16 +39,6 @@ public class Party implements Identifiable { } - @Override - public String getTrunkClass() { - return trunkClass; - } - - @Override - public void setTrunkClass(String trunkClass) { - this.trunkClass = trunkClass; - } - @Override public AbstractMarshaller getMarshaller() { return new PartyMarshaller(); diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/Permission.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/Permission.java index bee579a53..ba3ec3323 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/security/Permission.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/Permission.java @@ -30,8 +30,6 @@ import java.util.Date; */ public class Permission implements Identifiable { - private String trunkClass; - private long permissionId; private String grantedPrivilege; private CcmObject object; @@ -46,17 +44,6 @@ public class Permission implements Identifiable { } - - @Override - public String getTrunkClass() { - return this.trunkClass; - } - - @Override - public void setTrunkClass(String trunkClass) { - this.trunkClass = trunkClass; - } - @Override public AbstractMarshaller getMarshaller() { return new PermissionMarshaller(); diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/Role.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/Role.java index c86efefb5..a406a1f68 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/security/Role.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/Role.java @@ -33,8 +33,6 @@ import java.util.Set; */ public class Role implements Identifiable { - private String trunkClass; - private long roleId; private String name; private Set memberships = new HashSet<>(); @@ -42,17 +40,6 @@ public class Role implements Identifiable { private List assignedTasks; - - @Override - public String getTrunkClass() { - return this.trunkClass; - } - - @Override - public void setTrunkClass(String trunkClass) { - this.trunkClass = trunkClass; - } - @Override public AbstractMarshaller getMarshaller() { return new RoleMarshaller(); diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/RoleMembership.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/RoleMembership.java index 7ee75afce..6792b803b 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/security/RoleMembership.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/RoleMembership.java @@ -27,8 +27,6 @@ import com.arsdigita.portation.Identifiable; */ public class RoleMembership implements Identifiable { - private String trunkClass; - private long membershipId; private Role role; private Party member; @@ -38,16 +36,6 @@ public class RoleMembership implements Identifiable { } - @Override - public String getTrunkClass() { - return this.trunkClass; - } - - @Override - public void setTrunkClass(String trunkClass) { - this.trunkClass = trunkClass; - } - @Override public AbstractMarshaller getMarshaller() { return new RoleMembershipMarshaller(); 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 8d571eb63..5db65f6be 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 @@ -30,8 +30,6 @@ import java.util.List; */ public class Task implements Identifiable { - private String trunkClass; - private long taskId; private LocalizedString label; private LocalizedString description; @@ -47,16 +45,6 @@ public class Task implements Identifiable { } - @Override - public String getTrunkClass() { - return this.trunkClass; - } - - @Override - public void setTrunkClass(String trunkClass) { - this.trunkClass = trunkClass; - } - @Override public AbstractMarshaller getMarshaller() { return new TaskMarshaller(); 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 3de8ed63a..2ce45fca7 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 @@ -28,8 +28,6 @@ import com.arsdigita.portation.modules.core.security.Role; */ public class TaskAssignment implements Identifiable { - private String trunkClass; - private long taskAssignmentId; private UserTask task; private Role role; @@ -38,17 +36,6 @@ public class TaskAssignment implements Identifiable { } - - @Override - public String getTrunkClass() { - return this.trunkClass; - } - - @Override - public void setTrunkClass(String trunkClass) { - this.trunkClass = trunkClass; - } - @Override public AbstractMarshaller getMarshaller() { return new TaskAssignmentMarshaller(); diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/workflow/Workflow.java b/ccm-core/src/com/arsdigita/portation/modules/core/workflow/Workflow.java index 5fb091ec2..f76260c14 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/workflow/Workflow.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/workflow/Workflow.java @@ -43,16 +43,6 @@ public class Workflow implements Identifiable { } - @Override - public String getTrunkClass() { - return this.trunkClass; - } - - @Override - public void setTrunkClass(String trunkClass) { - this.trunkClass = trunkClass; - } - @Override public AbstractMarshaller getMarshaller() { return new WorkflowMarshaller();