diff --git a/ccm-core/src/com/arsdigita/portation/AbstractMarshaller.java b/ccm-core/src/com/arsdigita/portation/AbstractMarshaller.java index be974b218..7d63a6dfc 100644 --- a/ccm-core/src/com/arsdigita/portation/AbstractMarshaller.java +++ b/ccm-core/src/com/arsdigita/portation/AbstractMarshaller.java @@ -18,8 +18,6 @@ */ package com.arsdigita.portation; -import com.fasterxml.jackson.annotation.JsonAutoDetect; -import com.fasterxml.jackson.annotation.PropertyAccessor; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule; @@ -39,7 +37,7 @@ import java.util.List; * .FileMarshal). * * @author Tobias Osmers - * @version created the 03.02.2016 + * @version created on 03.02.2016 */ public enum Format { CSV, XML, JSON diff --git a/ccm-core/src/com/arsdigita/portation/Identifiable.java b/ccm-core/src/com/arsdigita/portation/Identifiable.java index f8b15fbf5..9a75f8b15 100644 --- a/ccm-core/src/com/arsdigita/portation/Identifiable.java +++ b/ccm-core/src/com/arsdigita/portation/Identifiable.java @@ -20,7 +20,7 @@ package com.arsdigita.portation; /** * @author Tobias Osmers - * @version created the 03.02.2016 + * @version created on 03.02.2016 */ public class Marshaller { private static final Logger log = Logger.getLogger(Marshaller.class); diff --git a/ccm-core/src/com/arsdigita/portation/cmd/ExportCliTool.java b/ccm-core/src/com/arsdigita/portation/cmd/ExportCliTool.java index 606e756c8..40fcb8ac2 100644 --- a/ccm-core/src/com/arsdigita/portation/cmd/ExportCliTool.java +++ b/ccm-core/src/com/arsdigita/portation/cmd/ExportCliTool.java @@ -28,7 +28,7 @@ import org.apache.log4j.Logger; * one or many specified file types. * * @author Tobias Osmers - * @version created the 25.07.2016 + * @version created on 25.07.2016 */ class ExportHelper { diff --git a/ccm-core/src/com/arsdigita/portation/conversion/MainConverter.java b/ccm-core/src/com/arsdigita/portation/conversion/MainConverter.java index 646e8b75b..740aec9b6 100644 --- a/ccm-core/src/com/arsdigita/portation/conversion/MainConverter.java +++ b/ccm-core/src/com/arsdigita/portation/conversion/MainConverter.java @@ -33,7 +33,7 @@ import com.arsdigita.portation.conversion.core.workflow.WorkflowConversion; * stored in maps as -pairs in the {@link NgCollection}-class. * * @author Tobias Osmers - * @version created the 27.6.16 + * @version created on 27.6.16 */ public class NgCollection { diff --git a/ccm-core/src/com/arsdigita/portation/conversion/core/categorization/CategoryConversion.java b/ccm-core/src/com/arsdigita/portation/conversion/core/categorization/CategoryConversion.java index 6fdd049c5..24e1a6453 100644 --- a/ccm-core/src/com/arsdigita/portation/conversion/core/categorization/CategoryConversion.java +++ b/ccm-core/src/com/arsdigita/portation/conversion/core/categorization/CategoryConversion.java @@ -34,7 +34,7 @@ import java.util.List; * classes into the new ng-system. * * @author Tobias Osmers - * @version created the 4.7.16 + * @version created on 4.7.16 */ public class GroupConversion { diff --git a/ccm-core/src/com/arsdigita/portation/conversion/core/security/PermissionConversion.java b/ccm-core/src/com/arsdigita/portation/conversion/core/security/PermissionConversion.java index 7fe591ab9..70202a3cb 100644 --- a/ccm-core/src/com/arsdigita/portation/conversion/core/security/PermissionConversion.java +++ b/ccm-core/src/com/arsdigita/portation/conversion/core/security/PermissionConversion.java @@ -40,7 +40,7 @@ import java.util.stream.Collectors; * classes into the new ng-system. * * @author Tobias Osmers - * @version created the 4.7.16 + * @version created on 4.7.16 */ public class RoleConversion { diff --git a/ccm-core/src/com/arsdigita/portation/conversion/core/security/UserConversion.java b/ccm-core/src/com/arsdigita/portation/conversion/core/security/UserConversion.java index 61d886c89..16591e67a 100644 --- a/ccm-core/src/com/arsdigita/portation/conversion/core/security/UserConversion.java +++ b/ccm-core/src/com/arsdigita/portation/conversion/core/security/UserConversion.java @@ -28,7 +28,7 @@ import java.util.List; * classes into the new ng-system. * * @author Tobias Osmers - * @version created the 29.6.16 + * @version created on 29.6.16 */ public class UserTaskConversion { diff --git a/ccm-core/src/com/arsdigita/portation/conversion/core/workflow/WorkflowConversion.java b/ccm-core/src/com/arsdigita/portation/conversion/core/workflow/WorkflowConversion.java index a205ccbb1..3e117fcc5 100644 --- a/ccm-core/src/com/arsdigita/portation/conversion/core/workflow/WorkflowConversion.java +++ b/ccm-core/src/com/arsdigita/portation/conversion/core/workflow/WorkflowConversion.java @@ -29,7 +29,7 @@ import java.util.List; * classes into the new ng-system. * * @author Tobias Osmers<\a> - * @version created the 6/15/16 + * @version created on 6/15/16 */ public class Categorization implements Identifiable { diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/categorization/CategorizationMarshaller.java b/ccm-core/src/com/arsdigita/portation/modules/core/categorization/CategorizationMarshaller.java index e87852762..e73b9f69e 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/categorization/CategorizationMarshaller.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/categorization/CategorizationMarshaller.java @@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller; /** * @author Tobias Osmers<\a> - * @version created the 6/15/16 + * @version created on 6/15/16 */ public class Category extends CcmObject { diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/categorization/CategoryMarshaller.java b/ccm-core/src/com/arsdigita/portation/modules/core/categorization/CategoryMarshaller.java index 9e71de20f..cf0436624 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/categorization/CategoryMarshaller.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/categorization/CategoryMarshaller.java @@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller; /** * @author Tobias Osmers<\a> - * @version created the 6/15/16 + * @version created on 6/15/16 */ public class CcmObject implements Identifiable { diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/core/CcmObjectMarshaller.java b/ccm-core/src/com/arsdigita/portation/modules/core/core/CcmObjectMarshaller.java index e030d7e45..2e1701d9f 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/core/CcmObjectMarshaller.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/core/CcmObjectMarshaller.java @@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller; /** * @author Tobias Osmers<\a> - * @version created the 6/15/16 + * @version created on 6/15/16 */ public class EmailAddress implements Identifiable { diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/core/EmailAddressMarshaller.java b/ccm-core/src/com/arsdigita/portation/modules/core/core/EmailAddressMarshaller.java index 0aed7ec8b..70612a7d4 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/core/EmailAddressMarshaller.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/core/EmailAddressMarshaller.java @@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller; /** * @author Tobias Osmers<\a> - * @version created the 6/15/16 + * @version created on 6/15/16 */ public class LocalizedString implements Identifiable { diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/l10n/LocalizedStringMarshaller.java b/ccm-core/src/com/arsdigita/portation/modules/core/l10n/LocalizedStringMarshaller.java index 59dd73e70..a55e0844b 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/l10n/LocalizedStringMarshaller.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/l10n/LocalizedStringMarshaller.java @@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller; /** * @author Tobias Osmers<\a> - * @version created the 31.05.16 + * @version created on 31.05.16 */ public class Group extends Party { diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/GroupMarshaller.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/GroupMarshaller.java index 9c781a742..819706a73 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/security/GroupMarshaller.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/GroupMarshaller.java @@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller; /** * @author Tobias Osmers<\a> - * @version created the 6/15/16 + * @version created on 6/15/16 */ public class GroupMembership implements Identifiable { diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/GroupMembershipMarshaller.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/GroupMembershipMarshaller.java index a6c2c9d68..e8b5df47a 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/security/GroupMembershipMarshaller.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/GroupMembershipMarshaller.java @@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller; /** * @author Tobias Osmers<\a> - * @version created the 01.06.16 + * @version created on 01.06.16 */ public class Party implements Identifiable { diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/PartyMarshaller.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/PartyMarshaller.java index 8db3dd6d8..dca7e0aba 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/security/PartyMarshaller.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/PartyMarshaller.java @@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller; /** * @author Tobias Osmers<\a> - * @version created the 6/15/16 + * @version created on 6/15/16 */ public class Permission implements Identifiable { diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/PermissionMarshaller.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/PermissionMarshaller.java index 3d7f23bed..2ec3b7606 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/security/PermissionMarshaller.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/PermissionMarshaller.java @@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller; /** * @author Tobias Osmers<\a> - * @version created the 6/15/16 + * @version created on 6/15/16 */ public class Role implements Identifiable { diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/RoleMarshaller.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/RoleMarshaller.java index 860cd585c..a28f28ac5 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/security/RoleMarshaller.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/RoleMarshaller.java @@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller; /** * @author Tobias Osmers<\a> - * @version created the 6/15/16 + * @version created on 6/15/16 */ public class RoleMembership implements Identifiable { diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/RoleMembershipMarshaller.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/RoleMembershipMarshaller.java index 01354e563..c30545067 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/security/RoleMembershipMarshaller.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/RoleMembershipMarshaller.java @@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller; /** * @author Tobias Osmers<\a> - * @version created the 31.05.16 + * @version created on 31.05.16 */ public class User extends Party { diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/security/UserMarshaller.java b/ccm-core/src/com/arsdigita/portation/modules/core/security/UserMarshaller.java index f92d39753..67863b4cc 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/security/UserMarshaller.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/security/UserMarshaller.java @@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller; /** * @author Tobias Osmers<\a> - * @version created the 6/15/16 + * @version created on 6/15/16 */ public class Task implements Identifiable { 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 6becab966..0a6fbd970 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 @@ -25,7 +25,7 @@ import com.arsdigita.portation.modules.core.security.Role; /** * @author Tobias Osmers<\a> - * @version created the 6/15/16 + * @version created on 6/15/16 */ public class TaskAssignmentMarshaller extends AbstractMarshaller { } diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/workflow/TaskMarshaller.java b/ccm-core/src/com/arsdigita/portation/modules/core/workflow/TaskMarshaller.java index ea14cd20b..974f39967 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/workflow/TaskMarshaller.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/workflow/TaskMarshaller.java @@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller; /** * @author Tobias Osmers<\a> - * @version created the 6/15/16 + * @version created on 6/15/16 */ public class UserTask extends Task { diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/workflow/UserTaskMarshaller.java b/ccm-core/src/com/arsdigita/portation/modules/core/workflow/UserTaskMarshaller.java index 89b55adc8..61a10de4b 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/workflow/UserTaskMarshaller.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/workflow/UserTaskMarshaller.java @@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller; /** * @author Tobias Osmers<\a> - * @version created the 6/15/16 + * @version created on 6/15/16 */ public class Workflow implements Identifiable { diff --git a/ccm-core/src/com/arsdigita/portation/modules/core/workflow/WorkflowMarshaller.java b/ccm-core/src/com/arsdigita/portation/modules/core/workflow/WorkflowMarshaller.java index ac2d9521b..a9bbf1ce2 100644 --- a/ccm-core/src/com/arsdigita/portation/modules/core/workflow/WorkflowMarshaller.java +++ b/ccm-core/src/com/arsdigita/portation/modules/core/workflow/WorkflowMarshaller.java @@ -22,7 +22,7 @@ import com.arsdigita.portation.AbstractMarshaller; /** * @author