svn commit: r1593516 - in /syncope/branches/1_1_X: 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

[mdisabatino]

Author: mdisabatino
Date: Fri May  9 11:43:23 2014
New Revision: 1593516

URL: http://svn.apache.org/r1593516
Log:
SYNCOPE-485 Upgrade to Activity 5.15.1

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

Modified: 
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java
URL: 
http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java?rev=1593516&r1=1593515&r2=1593516&view=diff
==============================================================================
--- 
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java
 (original)
+++ 
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java
 Fri May  9 11:43:23 2014
@@ -103,7 +103,12 @@ public class SyncopeGroupManager impleme
     }
 
     @Override
-    public void updateGroup(final GroupEntity updatedGroup) {
+    public void updateGroup(final Group updatedGroup) {
+        throw new UnsupportedOperationException();
+    }
+    
+    @Override
+    public boolean isNewGroup(final Group group) {
         throw new UnsupportedOperationException();
     }
 

Modified: 
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java
URL: 
http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java?rev=1593516&r1=1593515&r2=1593516&view=diff
==============================================================================
--- 
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java
 (original)
+++ 
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java
 Fri May  9 11:43:23 2014
@@ -23,6 +23,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import org.activiti.engine.identity.Group;
+import org.activiti.engine.identity.Picture;
 import org.activiti.engine.identity.User;
 import org.activiti.engine.identity.UserQuery;
 import org.activiti.engine.impl.Page;
@@ -112,7 +113,22 @@ public class SyncopeUserManager implemen
     }
 
     @Override
-    public void updateUser(final UserEntity updatedUser) {
+    public boolean isNewUser(final User user) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void updateUser(final User updatedUser) {
+        throw new UnsupportedOperationException();
+    }
+    
+    @Override
+    public Picture getUserPicture(final String string) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void setUserPicture(final String string, final Picture pctr) {
         throw new UnsupportedOperationException();
     }
 

Modified: syncope/branches/1_1_X/pom.xml
URL: 
http://svn.apache.org/viewvc/syncope/branches/1_1_X/pom.xml?rev=1593516&r1=1593515&r2=1593516&view=diff
==============================================================================
--- syncope/branches/1_1_X/pom.xml (original)
+++ syncope/branches/1_1_X/pom.xml Fri May  9 11:43:23 2014
@@ -318,7 +318,7 @@ under the License.
         
     <hc.client.version>4.2.6</hc.client.version>
 
-    <activiti.version>5.14</activiti.version>
+    <activiti.version>5.15.1</activiti.version>
 
     <cxf.version>2.7.11</cxf.version>  
     <spring.version>3.2.8.RELEASE</spring.version>