Repository: syncope Updated Branches: refs/heads/1_2_X 60a62434e -> 3237d26df refs/heads/2_0_X 820a99169 -> c42936baa refs/heads/master 920f73adc -> 849d2f6ff
[SYNCOPE-620] Some refinements Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3ba2ad66 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3ba2ad66 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3ba2ad66 Branch: refs/heads/2_0_X Commit: 3ba2ad6692086c1cbad8a2a9c76a0fe829361fc5 Parents: 820a991 Author: Francesco Chicchiriccò <[email protected]> Authored: Tue Jan 27 13:40:57 2015 +0100 Committer: Francesco Chicchiriccò <[email protected]> Committed: Tue Jan 27 13:40:57 2015 +0100 ---------------------------------------------------------------------- .../apache/syncope/common/lib/types/EntityViolationType.java | 6 +++--- .../org/apache/syncope/common/lib/types/SyncPolicySpec.java | 4 ++-- syncope620/pom.xml | 2 +- .../org/apache/syncope/server/persistence/api/dao/RoleDAO.java | 2 +- .../syncope/server/persistence/api/entity/user/User.java | 2 +- .../server/persistence/jpa/dao/JPASubjectSearchDAO.java | 2 +- .../apache/syncope/server/persistence/jpa/dao/JPAUserDAO.java | 2 +- .../syncope/server/persistence/jpa/entity/user/JPAUser.java | 6 +++--- .../server/persistence/jpa/validation/entity/RoleCheck.java | 2 +- .../server/persistence/jpa/validation/entity/UserCheck.java | 2 +- .../provisioning/java/propagation/PropagationManagerImpl.java | 2 +- .../apache/syncope/server/workflow/activiti/task/Create.java | 2 +- .../apache/syncope/server/workflow/activiti/task/Delete.java | 4 ++-- .../apache/syncope/server/workflow/activiti/task/Update.java | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/3ba2ad66/syncope620/common/lib/src/main/java/org/apache/syncope/common/lib/types/EntityViolationType.java ---------------------------------------------------------------------- diff --git a/syncope620/common/lib/src/main/java/org/apache/syncope/common/lib/types/EntityViolationType.java b/syncope620/common/lib/src/main/java/org/apache/syncope/common/lib/types/EntityViolationType.java index 7d1fc70..1150e60 100644 --- a/syncope620/common/lib/src/main/java/org/apache/syncope/common/lib/types/EntityViolationType.java +++ b/syncope620/common/lib/src/main/java/org/apache/syncope/common/lib/types/EntityViolationType.java @@ -34,7 +34,7 @@ public enum EntityViolationType { InvalidMVirSchema("org.apache.syncope.server.persistence.validation.attrvalue.mVirSchema"), InvalidName("org.apache.syncope.server.persistence.validation.name"), InvalidNotification("org.apache.syncope.server.persistence.validation.notification"), - InvalidPassword("org.apache.syncope.server.persistence.validation.syncopeuser.password"), + InvalidPassword("org.apache.syncope.server.persistence.validation.user.password"), InvalidPasswordPolicy("org.apache.syncope.server.persistence.validation.passwordpolicy"), InvalidPolicy("org.apache.syncope.server.persistence.validation.policy"), InvalidPropagationTask("org.apache.syncope.server.persistence.validation.propagationtask"), @@ -43,7 +43,7 @@ public enum EntityViolationType { InvalidRVirSchema("org.apache.syncope.server.persistence.validation.attrvalue.rVirSchema"), InvalidReport("org.apache.syncope.server.persistence.validation.report"), InvalidResource("org.apache.syncope.server.persistence.validation.externalresource"), - InvalidRoleOwner("org.apache.syncope.server.persistence.validation.syncoperole.owner"), + InvalidRoleOwner("org.apache.syncope.server.persistence.validation.role.owner"), InvalidSchemaEncrypted("org.apache.syncope.server.persistence.validation.schema.encrypted"), InvalidSchemaEnum("org.apache.syncope.server.persistence.validation.schema.enum"), InvalidSchemaMultivalueUnique("org.apache.syncope.server.persistence.validation.schema.multivalueUnique"), @@ -53,7 +53,7 @@ public enum EntityViolationType { InvalidUPlainSchema("org.apache.syncope.server.persistence.validation.attrvalue.uPlainSchema"), InvalidUDerSchema("org.apache.syncope.server.persistence.validation.attrvalue.derSchema"), InvalidUVirSchema("org.apache.syncope.server.persistence.validation.attrvalue.uVirSchema"), - InvalidUsername("org.apache.syncope.server.persistence.validation.syncopeuser.username"), + InvalidUsername("org.apache.syncope.server.persistence.validation.user.username"), InvalidValueList("org.apache.syncope.server.persistence.validation.attr.valueList"), MoreThanOneNonNull("org.apache.syncope.server.persistence.validation.attrvalue.moreThanOneNonNull"); http://git-wip-us.apache.org/repos/asf/syncope/blob/3ba2ad66/syncope620/common/lib/src/main/java/org/apache/syncope/common/lib/types/SyncPolicySpec.java ---------------------------------------------------------------------- diff --git a/syncope620/common/lib/src/main/java/org/apache/syncope/common/lib/types/SyncPolicySpec.java b/syncope620/common/lib/src/main/java/org/apache/syncope/common/lib/types/SyncPolicySpec.java index 9894b9b..e0040de 100644 --- a/syncope620/common/lib/src/main/java/org/apache/syncope/common/lib/types/SyncPolicySpec.java +++ b/syncope620/common/lib/src/main/java/org/apache/syncope/common/lib/types/SyncPolicySpec.java @@ -33,7 +33,7 @@ public class SyncPolicySpec implements PolicySpec { private static final long serialVersionUID = -3144027171719498127L; /** - * SyncopeUser attributes and fields for matching during synchronization. + * User attributes and fields for matching during synchronization. */ @SchemaList(extended = true) private final List<String> uAltSearchSchemas = new ArrayList<String>(); @@ -42,7 +42,7 @@ public class SyncPolicySpec implements PolicySpec { private String userJavaRule; /** - * SyncopeRole attributes and fields for matching during synchronization. + * Role attributes and fields for matching during synchronization. */ @SchemaList(extended = true) private final List<String> rAltSearchSchemas = new ArrayList<String>(); http://git-wip-us.apache.org/repos/asf/syncope/blob/3ba2ad66/syncope620/pom.xml ---------------------------------------------------------------------- diff --git a/syncope620/pom.xml b/syncope620/pom.xml index c7e6cf2..7abfd74 100644 --- a/syncope620/pom.xml +++ b/syncope620/pom.xml @@ -322,7 +322,7 @@ under the License. <cxf.version>3.0.3</cxf.version> - <jackson.version>2.5.0</jackson.version> + <jackson.version>2.4.5</jackson.version> <spring.version>4.1.4.RELEASE</spring.version> <spring-security.version>3.2.5.RELEASE</spring-security.version> http://git-wip-us.apache.org/repos/asf/syncope/blob/3ba2ad66/syncope620/server/persistence-api/src/main/java/org/apache/syncope/server/persistence/api/dao/RoleDAO.java ---------------------------------------------------------------------- diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/server/persistence/api/dao/RoleDAO.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/server/persistence/api/dao/RoleDAO.java index 778443e..1355638 100644 --- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/server/persistence/api/dao/RoleDAO.java +++ b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/server/persistence/api/dao/RoleDAO.java @@ -74,7 +74,7 @@ public interface RoleDAO extends SubjectDAO<RPlainAttr, RDerAttr, RVirAttr> { int count(); - Role save(Role syncopeRole) throws InvalidEntityException; + Role save(Role role) throws InvalidEntityException; void delete(Role role); http://git-wip-us.apache.org/repos/asf/syncope/blob/3ba2ad66/syncope620/server/persistence-api/src/main/java/org/apache/syncope/server/persistence/api/entity/user/User.java ---------------------------------------------------------------------- diff --git a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/server/persistence/api/entity/user/User.java b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/server/persistence/api/entity/user/User.java index d6b30d0..3e820bc 100644 --- a/syncope620/server/persistence-api/src/main/java/org/apache/syncope/server/persistence/api/entity/user/User.java +++ b/syncope620/server/persistence-api/src/main/java/org/apache/syncope/server/persistence/api/entity/user/User.java @@ -47,7 +47,7 @@ public interface User extends Subject<UPlainAttr, UDerAttr, UVirAttr> { Date getLastLoginDate(); - Membership getMembership(Long syncopeRoleId); + Membership getMembership(Long roleKey); List<? extends Membership> getMemberships(); http://git-wip-us.apache.org/repos/asf/syncope/blob/3ba2ad66/syncope620/server/persistence-jpa/src/main/java/org/apache/syncope/server/persistence/jpa/dao/JPASubjectSearchDAO.java ---------------------------------------------------------------------- diff --git a/syncope620/server/persistence-jpa/src/main/java/org/apache/syncope/server/persistence/jpa/dao/JPASubjectSearchDAO.java b/syncope620/server/persistence-jpa/src/main/java/org/apache/syncope/server/persistence/jpa/dao/JPASubjectSearchDAO.java index 36d48e7..f8e1804 100644 --- a/syncope620/server/persistence-jpa/src/main/java/org/apache/syncope/server/persistence/jpa/dao/JPASubjectSearchDAO.java +++ b/syncope620/server/persistence-jpa/src/main/java/org/apache/syncope/server/persistence/jpa/dao/JPASubjectSearchDAO.java @@ -673,7 +673,7 @@ public class JPASubjectSearchDAO extends AbstractDAO<Subject<?, ?, ?>, Long> imp } // Deal with subject Integer fields logically mapping to boolean values - // (SyncopeRole.inheritPlainAttrs, for example) + // (JPARole.inheritPlainAttrs, for example) boolean foundBooleanMin = false; boolean foundBooleanMax = false; if (Integer.class.equals(subjectField.getType())) { http://git-wip-us.apache.org/repos/asf/syncope/blob/3ba2ad66/syncope620/server/persistence-jpa/src/main/java/org/apache/syncope/server/persistence/jpa/dao/JPAUserDAO.java ---------------------------------------------------------------------- diff --git a/syncope620/server/persistence-jpa/src/main/java/org/apache/syncope/server/persistence/jpa/dao/JPAUserDAO.java b/syncope620/server/persistence-jpa/src/main/java/org/apache/syncope/server/persistence/jpa/dao/JPAUserDAO.java index b4a6171..3b79045 100644 --- a/syncope620/server/persistence-jpa/src/main/java/org/apache/syncope/server/persistence/jpa/dao/JPAUserDAO.java +++ b/syncope620/server/persistence-jpa/src/main/java/org/apache/syncope/server/persistence/jpa/dao/JPAUserDAO.java @@ -236,7 +236,7 @@ public class JPAUserDAO extends AbstractSubjectDAO<UPlainAttr, UDerAttr, UVirAtt } private void securityChecks(final User user) { - // Allows anonymous (during self-registration) and self (during self-update) to read own SyncopeUser, + // Allows anonymous (during self-registration) and self (during self-update) to read own user, // otherwise goes thorugh security checks to see if needed role entitlements are owned if (!AuthContextUtil.getAuthenticatedUsername().equals(anonymousUser) && !AuthContextUtil.getAuthenticatedUsername().equals(user.getUsername())) { http://git-wip-us.apache.org/repos/asf/syncope/blob/3ba2ad66/syncope620/server/persistence-jpa/src/main/java/org/apache/syncope/server/persistence/jpa/entity/user/JPAUser.java ---------------------------------------------------------------------- diff --git a/syncope620/server/persistence-jpa/src/main/java/org/apache/syncope/server/persistence/jpa/entity/user/JPAUser.java b/syncope620/server/persistence-jpa/src/main/java/org/apache/syncope/server/persistence/jpa/entity/user/JPAUser.java index 276cf63..9ee1d04 100644 --- a/syncope620/server/persistence-jpa/src/main/java/org/apache/syncope/server/persistence/jpa/entity/user/JPAUser.java +++ b/syncope620/server/persistence-jpa/src/main/java/org/apache/syncope/server/persistence/jpa/entity/user/JPAUser.java @@ -68,7 +68,7 @@ import org.apache.syncope.server.misc.security.Encryptor; import org.apache.syncope.server.misc.security.SecureRandomUtil; /** - * Syncope user bean. + * JPA user bean. */ @Entity @Table(name = JPAUser.TABLE) @@ -211,12 +211,12 @@ public class JPAUser extends AbstractSubject<UPlainAttr, UDerAttr, UVirAttr> imp } @Override - public Membership getMembership(final Long syncopeRoleId) { + public Membership getMembership(final Long roleKey) { Membership result = null; Membership membership; for (Iterator<? extends Membership> itor = getMemberships().iterator(); result == null && itor.hasNext();) { membership = itor.next(); - if (membership.getRole() != null && syncopeRoleId.equals(membership.getRole().getKey())) { + if (membership.getRole() != null && roleKey.equals(membership.getRole().getKey())) { result = membership; } } http://git-wip-us.apache.org/repos/asf/syncope/blob/3ba2ad66/syncope620/server/persistence-jpa/src/main/java/org/apache/syncope/server/persistence/jpa/validation/entity/RoleCheck.java ---------------------------------------------------------------------- diff --git a/syncope620/server/persistence-jpa/src/main/java/org/apache/syncope/server/persistence/jpa/validation/entity/RoleCheck.java b/syncope620/server/persistence-jpa/src/main/java/org/apache/syncope/server/persistence/jpa/validation/entity/RoleCheck.java index 1a294da..863458b 100644 --- a/syncope620/server/persistence-jpa/src/main/java/org/apache/syncope/server/persistence/jpa/validation/entity/RoleCheck.java +++ b/syncope620/server/persistence-jpa/src/main/java/org/apache/syncope/server/persistence/jpa/validation/entity/RoleCheck.java @@ -33,7 +33,7 @@ import javax.validation.Payload; @Documented public @interface RoleCheck { - String message() default "{org.apache.syncope.server.persistence.validation.syncoperole}"; + String message() default "{org.apache.syncope.server.persistence.validation.role}"; Class<?>[] groups() default {}; http://git-wip-us.apache.org/repos/asf/syncope/blob/3ba2ad66/syncope620/server/persistence-jpa/src/main/java/org/apache/syncope/server/persistence/jpa/validation/entity/UserCheck.java ---------------------------------------------------------------------- diff --git a/syncope620/server/persistence-jpa/src/main/java/org/apache/syncope/server/persistence/jpa/validation/entity/UserCheck.java b/syncope620/server/persistence-jpa/src/main/java/org/apache/syncope/server/persistence/jpa/validation/entity/UserCheck.java index 23697fe..05b1ccc 100644 --- a/syncope620/server/persistence-jpa/src/main/java/org/apache/syncope/server/persistence/jpa/validation/entity/UserCheck.java +++ b/syncope620/server/persistence-jpa/src/main/java/org/apache/syncope/server/persistence/jpa/validation/entity/UserCheck.java @@ -34,7 +34,7 @@ import javax.validation.Payload; @Documented public @interface UserCheck { - String message() default "{org.apache.syncope.server.persistence.validation.syncopeuser}"; + String message() default "{org.apache.syncope.server.persistence.validation.user}"; Class<?>[] groups() default {}; http://git-wip-us.apache.org/repos/asf/syncope/blob/3ba2ad66/syncope620/server/provisioning-java/src/main/java/org/apache/syncope/server/provisioning/java/propagation/PropagationManagerImpl.java ---------------------------------------------------------------------- diff --git a/syncope620/server/provisioning-java/src/main/java/org/apache/syncope/server/provisioning/java/propagation/PropagationManagerImpl.java b/syncope620/server/provisioning-java/src/main/java/org/apache/syncope/server/provisioning/java/propagation/PropagationManagerImpl.java index cf4f309..3003b9f 100644 --- a/syncope620/server/provisioning-java/src/main/java/org/apache/syncope/server/provisioning/java/propagation/PropagationManagerImpl.java +++ b/syncope620/server/provisioning-java/src/main/java/org/apache/syncope/server/provisioning/java/propagation/PropagationManagerImpl.java @@ -279,7 +279,7 @@ public class PropagationManagerImpl implements PropagationManager { final Set<String> noPropResourceNames) throws NotFoundException { return getUpdateTaskIds( - user, // SyncopeUser to be updated on external resources + user, // user to be updated on external resources null, // no password false, enable, // status to be propagated http://git-wip-us.apache.org/repos/asf/syncope/blob/3ba2ad66/syncope620/server/workflow-activiti/src/main/java/org/apache/syncope/server/workflow/activiti/task/Create.java ---------------------------------------------------------------------- diff --git a/syncope620/server/workflow-activiti/src/main/java/org/apache/syncope/server/workflow/activiti/task/Create.java b/syncope620/server/workflow-activiti/src/main/java/org/apache/syncope/server/workflow/activiti/task/Create.java index 3a6238d..4a1ab0e 100644 --- a/syncope620/server/workflow-activiti/src/main/java/org/apache/syncope/server/workflow/activiti/task/Create.java +++ b/syncope620/server/workflow-activiti/src/main/java/org/apache/syncope/server/workflow/activiti/task/Create.java @@ -45,7 +45,7 @@ public class Create extends AbstractActivitiServiceTask { dataBinder.create(user, userTO, storePassword == null ? true : storePassword); user.setWorkflowId(executionId); - // report SyncopeUser as result + // report user as result runtimeService.setVariable(executionId, ActivitiUserWorkflowAdapter.USER, user); } } http://git-wip-us.apache.org/repos/asf/syncope/blob/3ba2ad66/syncope620/server/workflow-activiti/src/main/java/org/apache/syncope/server/workflow/activiti/task/Delete.java ---------------------------------------------------------------------- diff --git a/syncope620/server/workflow-activiti/src/main/java/org/apache/syncope/server/workflow/activiti/task/Delete.java b/syncope620/server/workflow-activiti/src/main/java/org/apache/syncope/server/workflow/activiti/task/Delete.java index b8b3f94..b973146 100644 --- a/syncope620/server/workflow-activiti/src/main/java/org/apache/syncope/server/workflow/activiti/task/Delete.java +++ b/syncope620/server/workflow-activiti/src/main/java/org/apache/syncope/server/workflow/activiti/task/Delete.java @@ -29,12 +29,12 @@ public class Delete extends AbstractActivitiServiceTask { protected void doExecute(final String executionId) { User user = runtimeService.getVariable(executionId, ActivitiUserWorkflowAdapter.USER, User.class); - // Do something with SyncopeUser... + // Do something with user... if (user != null) { user.checkToken(""); } - // remove SyncopeUser variable + // remove user variable runtimeService.removeVariable(executionId, ActivitiUserWorkflowAdapter.USER); } } http://git-wip-us.apache.org/repos/asf/syncope/blob/3ba2ad66/syncope620/server/workflow-activiti/src/main/java/org/apache/syncope/server/workflow/activiti/task/Update.java ---------------------------------------------------------------------- diff --git a/syncope620/server/workflow-activiti/src/main/java/org/apache/syncope/server/workflow/activiti/task/Update.java b/syncope620/server/workflow-activiti/src/main/java/org/apache/syncope/server/workflow/activiti/task/Update.java index 731f7ac..bcb072e 100644 --- a/syncope620/server/workflow-activiti/src/main/java/org/apache/syncope/server/workflow/activiti/task/Update.java +++ b/syncope620/server/workflow-activiti/src/main/java/org/apache/syncope/server/workflow/activiti/task/Update.java @@ -44,7 +44,7 @@ public class Update extends AbstractActivitiServiceTask { if (actualMod.getPwdPropRequest() != null && !actualMod.getPwdPropRequest().isOnSyncope()) { actualMod.setPassword(null); } - // update SyncopeUser + // update user PropagationByResource propByRes = dataBinder.update(user, actualMod); // report updated user and propagation by resource as result
