Merge branch '2_0_X' of https://git-wip-us.apache.org/repos/asf/syncope into 2_0_X
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/9e7c6bd3 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/9e7c6bd3 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/9e7c6bd3 Branch: refs/heads/2_0_X Commit: 9e7c6bd39f3e11dd35d45bdd6aa06929c1f59550 Parents: b5daa7c 94b9622 Author: fmartelli <fabio.marte...@gmail.com> Authored: Fri May 26 16:02:54 2017 +0200 Committer: fmartelli <fabio.marte...@gmail.com> Committed: Fri May 26 16:02:54 2017 +0200 ---------------------------------------------------------------------- .../persistence/jpa/dao/JPAAnyObjectDAO.java | 2 +- .../core/persistence/jpa/dao/JPAUserDAO.java | 2 +- .../main/resources/domains/Master.properties | 5 ++- .../test/resources/domains/Master.properties | 5 ++- .../provisioning/api/PropagationByResource.java | 6 +++ .../DefaultAnyObjectProvisioningManager.java | 17 ++++++++- .../provisioning/java/VirAttrHandlerImpl.java | 5 +-- .../java/data/AbstractAnyDataBinder.java | 17 ++++++++- .../java/data/AnyObjectDataBinderImpl.java | 36 ++++++++++++++---- .../java/data/UserDataBinderImpl.java | 35 ++++++++++++++---- .../activiti/ActivitiUserWorkflowAdapter.java | 4 +- .../flowable/FlowableUserWorkflowAdapter.java | 4 +- .../java/DefaultAnyObjectWorkflowAdapter.java | 2 +- .../java/DefaultUserWorkflowAdapter.java | 4 +- .../resources/mariadb/domains/Master.properties | 5 ++- .../resources/mysql/domains/Master.properties | 5 ++- .../resources/oracle/domains/Master.properties | 5 ++- .../postgres/domains/Master.properties | 5 ++- .../sqlserver/domains/Master.properties | 5 ++- .../org/apache/syncope/fit/core/UserITCase.java | 5 +-- .../syncope/fit/core/UserIssuesITCase.java | 28 ++++++++++++++ .../systemadministration/dbcp.adoc | 39 ++++++++++++++++++++ .../systemadministration.adoc | 2 + 23 files changed, 201 insertions(+), 42 deletions(-) ----------------------------------------------------------------------
