Merge branch 'master' 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/c42936ba Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c42936ba Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c42936ba Branch: refs/heads/2_0_X Commit: c42936baaf870e829cd3d91998b8551d4bbd1f76 Parents: 3ba2ad6 849d2f6 Author: Francesco Chicchiriccò <[email protected]> Authored: Thu Jan 29 17:17:11 2015 +0100 Committer: Francesco Chicchiriccò <[email protected]> Committed: Thu Jan 29 17:17:11 2015 +0100 ---------------------------------------------------------------------- .../org/apache/syncope/common/to/MappingTO.java | 17 ++-- .../rest/controller/ResourceController.java | 4 +- .../data/AbstractAttributableDataBinder.java | 25 ++++++ .../syncope/core/rest/data/RoleDataBinder.java | 26 ++++-- .../syncope/core/rest/data/UserDataBinder.java | 38 ++++---- .../apache/syncope/core/rest/AbstractTest.java | 28 ++++-- .../syncope/core/rest/ConnectorTestITCase.java | 13 ++- .../syncope/core/rest/RoleTestITCase.java | 92 ++++++++++++++++++++ .../syncope/core/rest/UserSelfTestITCase.java | 2 +- pom.xml | 4 +- 10 files changed, 195 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/c42936ba/pom.xml ----------------------------------------------------------------------
