svn commit: r1436280 - in /syncope/trunk: core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java pom.xml

[ilgrosso]

Author: ilgrosso
Date: Mon Jan 21 11:28:43 2013
New Revision: 1436280

URL: http://svn.apache.org/viewvc?rev=1436280&view=rev
Log:
[SYNCOPE-253] Dependency upgraded and code adjusted accordinly

Modified:
    
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java
    
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java
    syncope/trunk/pom.xml

Modified: 
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java?rev=1436280&r1=1436279&r2=1436280&view=diff
==============================================================================
--- 
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java
 (original)
+++ 
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java
 Mon Jan 21 11:28:43 2013
@@ -21,7 +21,6 @@ package org.apache.syncope.core.workflow
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-
 import org.activiti.engine.identity.Group;
 import org.activiti.engine.identity.GroupQuery;
 import org.activiti.engine.impl.interceptor.Session;
@@ -97,7 +96,7 @@ public class SyncopeGroupManager extends
     }
 
     @Override
-    public void updateGroup(final Group updatedGroup) {
+    public void updateGroup(final GroupEntity updatedGroup) {
         throw new UnsupportedOperationException();
     }
 }

Modified: 
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java
URL: 
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java?rev=1436280&r1=1436279&r2=1436280&view=diff
==============================================================================
--- 
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java
 (original)
+++ 
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java
 Mon Jan 21 11:28:43 2013
@@ -21,7 +21,6 @@ package org.apache.syncope.core.workflow
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-
 import org.activiti.engine.identity.Group;
 import org.activiti.engine.identity.User;
 import org.activiti.engine.identity.UserQuery;
@@ -99,13 +98,11 @@ public class SyncopeUserManager extends 
 
     @Override
     public IdentityInfoEntity findUserInfoByUserIdAndKey(final String userId, 
final String key) {
-
         throw new UnsupportedOperationException();
     }
 
     @Override
     public List<String> findUserInfoKeysByUserIdAndType(final String userId, 
final String type) {
-
         throw new UnsupportedOperationException();
     }
 
@@ -115,7 +112,7 @@ public class SyncopeUserManager extends 
     }
 
     @Override
-    public void updateUser(final User updatedUser) {
+    public void updateUser(final UserEntity updatedUser) {
         throw new UnsupportedOperationException();
     }
 }

Modified: syncope/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1436280&r1=1436279&r2=1436280&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Mon Jan 21 11:28:43 2013
@@ -278,7 +278,7 @@ under the License.
         
     <httpcomponents.version>4.2.3</httpcomponents.version>
 
-    <activiti.version>5.10</activiti.version>
+    <activiti.version>5.11</activiti.version>
 
     <cxf.version>2.7.0</cxf.version>   
     <spring.version>3.1.3.RELEASE</spring.version>