svn commit: r1453421 - 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

[il...@apache.org]

Author: ilgrosso
Date: Wed Mar  6 16:54:10 2013
New Revision: 1453421

URL: http://svn.apache.org/r1453421
Log:
Upgrading to Activiti 5.12

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=1453421&r1=1453420&r2=1453421&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 Wed Mar  6 16:54:10 2013
@@ -25,14 +25,14 @@ import org.activiti.engine.identity.Grou
 import org.activiti.engine.identity.GroupQuery;
 import org.activiti.engine.impl.interceptor.Session;
 import org.activiti.engine.impl.persistence.entity.GroupEntity;
-import org.activiti.engine.impl.persistence.entity.GroupManager;
+import org.activiti.engine.impl.persistence.entity.GroupEntityManager;
 import org.apache.syncope.core.persistence.beans.role.SyncopeRole;
 import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
 import org.apache.syncope.core.persistence.dao.RoleDAO;
 import org.apache.syncope.core.persistence.dao.UserDAO;
 import org.springframework.beans.factory.annotation.Autowired;
 
-public class SyncopeGroupManager extends GroupManager implements SyncopeSession {
+public class SyncopeGroupManager extends GroupEntityManager implements SyncopeSession {
 
     @Autowired
     private UserDAO userDAO;
@@ -42,7 +42,7 @@ public class SyncopeGroupManager extends
 
     @Override
     public Class<? extends Session> getType() {
-        return GroupManager.class;
+        return GroupEntityManager.class;
     }
 
     @Override

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=1453421&r1=1453420&r2=1453421&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 Wed Mar  6 16:54:10 2013
@@ -28,14 +28,14 @@ import org.activiti.engine.impl.intercep
 import org.activiti.engine.impl.persistence.entity.GroupEntity;
 import org.activiti.engine.impl.persistence.entity.IdentityInfoEntity;
 import org.activiti.engine.impl.persistence.entity.UserEntity;
-import org.activiti.engine.impl.persistence.entity.UserManager;
+import org.activiti.engine.impl.persistence.entity.UserEntityManager;
 import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
 import org.apache.syncope.core.persistence.dao.EntitlementDAO;
 import org.apache.syncope.core.persistence.dao.RoleDAO;
 import org.apache.syncope.core.persistence.dao.UserDAO;
 import org.springframework.beans.factory.annotation.Autowired;
 
-public class SyncopeUserManager extends UserManager implements SyncopeSession {
+public class SyncopeUserManager extends UserEntityManager implements SyncopeSession {
 
     @Autowired
     private UserDAO userDAO;
@@ -48,7 +48,7 @@ public class SyncopeUserManager extends 
 
     @Override
     public Class<? extends Session> getType() {
-        return UserManager.class;
+        return UserEntityManager.class;
     }
 
     @Override

Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1453421&r1=1453420&r2=1453421&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Wed Mar  6 16:54:10 2013
@@ -288,7 +288,7 @@ under the License.
         
     <httpcomponents.version>4.2.3</httpcomponents.version>
 
-    <activiti.version>5.11</activiti.version>
+    <activiti.version>5.12</activiti.version>
 
     <cxf.version>2.7.3</cxf.version>	
     <spring.version>3.2.1.RELEASE</spring.version>