[6/7] syncope git commit: Merge from 1_2_X

[ilgrosso]

Merge from 1_2_X


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/849d2f6f
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/849d2f6f
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/849d2f6f

Branch: refs/heads/2_0_X
Commit: 849d2f6ff6d25e436ff0efc530792b2d475a2622
Parents: 920f73a 3237d26
Author: Francesco Chicchiriccò <ilgro...@apache.org>
Authored: Thu Jan 29 17:17:02 2015 +0100
Committer: Francesco Chicchiriccò <ilgro...@apache.org>
Committed: Thu Jan 29 17:17:02 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/849d2f6f/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/syncope/blob/849d2f6f/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index b71550b,a40e6c0..edd08ed
--- a/pom.xml
+++ b/pom.xml
@@@ -334,10 -335,9 +334,10 @@@ under the License
  
      <activiti.version>5.16.4</activiti.version>
  
-     <aspectj.version>1.8.4</aspectj.version>
+     <aspectj.version>1.8.5</aspectj.version>
 -
 -    <cxf.version>3.0.3</cxf.version>  
 +    
 +    <cxf.version>3.0.3</cxf.version>
 +    <camel.version>2.14.1</camel.version>     
      <spring.version>4.0.9.RELEASE</spring.version>
      <spring-security.version>3.2.5.RELEASE</spring-security.version>
      <jackson.version>2.4.5</jackson.version>