You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by md...@apache.org on 2014/05/09 16:01:35 UTC
svn commit: r1593543 - 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
Author: mdisabatino
Date: Fri May 9 14:01:35 2014
New Revision: 1593543
URL: http://svn.apache.org/r1593543
Log:
Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
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
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1592460-1593536
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=1593543&r1=1593542&r2=1593543&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 Fri May 9 14:01:35 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/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=1593543&r1=1593542&r2=1593543&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 Fri May 9 14:01:35 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/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1593543&r1=1593542&r2=1593543&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Fri May 9 14:01:35 2014
@@ -317,7 +317,7 @@ under the License.
<commons-jexl.version>2.1.1</commons-jexl.version>
<commons-lang.version>3.3.2</commons-lang.version>
- <activiti.version>5.14</activiti.version>
+ <activiti.version>5.15.1</activiti.version>
<aspectj.version>1.7.4</aspectj.version>
@@ -1133,7 +1133,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.12</version>
+ <version>2.12.1</version>
<dependencies>
<dependency>
<groupId>org.apache.syncope</groupId>