[8/9] syncope git commit: Merge branch 'master' into 2_0_X

[ilgrosso]

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/556fdb33
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/556fdb33
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/556fdb33

Branch: refs/heads/2_0_X
Commit: 556fdb332f7cee0808dbb9ff161446965e65db4c
Parents: 8b11d0c 920f73a
Author: Francesco Chicchiriccò <ilgro...@apache.org>
Authored: Mon Jan 26 17:59:23 2015 +0100
Committer: Francesco Chicchiriccò <ilgro...@apache.org>
Committed: Mon Jan 26 17:59:23 2015 +0100

----------------------------------------------------------------------
 .../common/services/ResourceService.java        |  11 --
 .../rest/controller/ResourceController.java     |  17 +--
 .../rest/utils/QueryResourceInfoComparator.java | 114 -------------------
 .../core/services/ResourceServiceImpl.java      |   7 +-
 core/src/main/resources/restContext.xml         |   3 -
 .../syncope/core/rest/ConnectorTestITCase.java  |  19 +++-
 .../syncope/core/rest/ResourceTestITCase.java   |  11 --
 7 files changed, 18 insertions(+), 164 deletions(-)
----------------------------------------------------------------------