Merge branch 'master' into SYNCOPE-156
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/85df1a77 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/85df1a77 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/85df1a77 Branch: refs/heads/SYNCOPE-156 Commit: 85df1a77abf823f8c4c9305f7f0ea973b1ed3041 Parents: 2aba8fb b3a79f4 Author: fmartelli <[email protected]> Authored: Tue Sep 15 11:25:12 2015 +0200 Committer: fmartelli <[email protected]> Committed: Tue Sep 15 11:25:12 2015 +0200 ---------------------------------------------------------------------- .../client/lib/RestClientExceptionMapper.java | 5 +- .../syncope/client/lib/SyncopeClient.java | 11 ++ .../builders/ConnObjectTOListQueryBuilder.java | 48 +++++++ .../common/lib/to/PagedConnObjectTOResult.java | 120 +++++++++++++++++ .../syncope/common/lib/types/Entitlement.java | 4 +- .../rest/api/beans/ConnObjectTOListQuery.java | 84 ++++++++++++ .../common/rest/api/service/JAXRSService.java | 2 + .../rest/api/service/ResourceService.java | 28 +++- .../syncope/core/logic/ResourceLogic.java | 81 ++++++++--- .../test/resources/domains/MasterContent.xml | 2 +- .../src/test/resources/domains/TwoContent.xml | 2 +- .../core/provisioning/api/Connector.java | 53 ++++++-- .../java/ConnIdBundleManagerImpl.java | 7 +- .../provisioning/java/ConnectorFacadeProxy.java | 133 ++++++++++++------- .../core/provisioning/java/sync/SyncUtils.java | 16 ++- .../rest/cxf/service/ResourceServiceImpl.java | 38 ++++++ .../fit/core/reference/ResourceITCase.java | 94 ++++++++++--- pom.xml | 12 +- 18 files changed, 627 insertions(+), 113 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/85df1a77/pom.xml ----------------------------------------------------------------------
