syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1502221 - in /syncope/branches/1_1_X: ./ core/src/main/java/org/apache/syncope/core/notification/ core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ core/src/test/java/org/apache/syncope/core/rest/
Date Thu, 11 Jul 2013 13:37:43 GMT
Author: ilgrosso
Date: Thu Jul 11 13:37:43 2013
New Revision: 1502221

URL: http://svn.apache.org/r1502221
Log:
Upgrading various deps and plugins, including Activiti 5.13

Modified:
    syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/notification/NotificationManager.java
    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/SyncopeGroupQueryImpl.java
    syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeSession.java
    syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java
    syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserQueryImpl.java
    syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java
    syncope/branches/1_1_X/pom.xml

Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/notification/NotificationManager.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/notification/NotificationManager.java?rev=1502221&r1=1502220&r2=1502221&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/notification/NotificationManager.java
(original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/notification/NotificationManager.java
Thu Jul 11 13:37:43 2013
@@ -111,9 +111,6 @@ public class NotificationManager {
     private VelocityEngine velocityEngine;
 
     @Autowired
-    private NotificationJob notificationJob;
-
-    @Autowired
     private EntitlementDAO entitlementDAO;
 
     @Autowired

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=1502221&r1=1502220&r2=1502221&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
Thu Jul 11 13:37:43 2013
@@ -21,18 +21,19 @@ package org.apache.syncope.core.workflow
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import org.activiti.engine.identity.Group;
 import org.activiti.engine.identity.GroupQuery;
-import org.activiti.engine.impl.interceptor.Session;
+import org.activiti.engine.impl.GroupQueryImpl;
+import org.activiti.engine.impl.Page;
 import org.activiti.engine.impl.persistence.entity.GroupEntity;
-import org.activiti.engine.impl.persistence.entity.GroupEntityManager;
-import org.apache.syncope.core.persistence.beans.role.SyncopeRole;
+import org.activiti.engine.impl.persistence.entity.GroupIdentityManager;
 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 GroupEntityManager implements SyncopeSession {
+public class SyncopeGroupManager implements GroupIdentityManager, SyncopeSession {
 
     @Autowired
     private UserDAO userDAO;
@@ -41,8 +42,8 @@ public class SyncopeGroupManager extends
     private RoleDAO roleDAO;
 
     @Override
-    public Class<? extends Session> getType() {
-        return GroupEntityManager.class;
+    public Class<?> getType() {
+        return GroupIdentityManager.class;
     }
 
     @Override
@@ -61,22 +62,6 @@ public class SyncopeGroupManager extends
     }
 
     @Override
-    public GroupEntity findGroupById(final String groupId) {
-        GroupEntity result = null;
-
-        SyncopeRole role = null;
-        try {
-            role = roleDAO.find(Long.valueOf(groupId));
-        } catch (NumberFormatException e) {
-        }
-        if (role != null) {
-            result = new GroupEntity(groupId);
-        }
-
-        return result;
-    }
-
-    @Override
     public List<Group> findGroupsByUser(final String userId) {
         List<Group> result = Collections.emptyList();
         SyncopeUser user = userDAO.find(userId);
@@ -91,6 +76,28 @@ public class SyncopeGroupManager extends
     }
 
     @Override
+    public List<Group> findGroupByQueryCriteria(final GroupQueryImpl query, final Page
page) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public long findGroupCountByQueryCriteria(final GroupQueryImpl query) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public List<Group> findGroupsByNativeQuery(final Map<String, Object> parameterMap,
final int firstResult,
+            final int maxResults) {
+
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public long findGroupCountByNativeQuery(final Map<String, Object> parameterMap)
{
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
     public void insertGroup(final Group group) {
         throw new UnsupportedOperationException();
     }
@@ -99,4 +106,12 @@ public class SyncopeGroupManager extends
     public void updateGroup(final GroupEntity updatedGroup) {
         throw new UnsupportedOperationException();
     }
+
+    @Override
+    public void flush() {
+    }
+
+    @Override
+    public void close() {
+    }
 }

Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupQueryImpl.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupQueryImpl.java?rev=1502221&r1=1502220&r2=1502221&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupQueryImpl.java
(original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupQueryImpl.java
Thu Jul 11 13:37:43 2013
@@ -103,10 +103,10 @@ public class SyncopeGroupQueryImpl imple
     private void execute() {
         if (roleId != null) {
             SyncopeRole role = roleDAO.find(roleId);
-            if (role != null) {
-                result = Collections.singletonList(fromSyncopeRole(role));
-            } else {
+            if (role == null) {
                 result = Collections.emptyList();
+            } else {
+                result = Collections.singletonList(fromSyncopeRole(role));
             }
         }
         if (result == null) {
@@ -151,7 +151,7 @@ public class SyncopeGroupQueryImpl imple
     }
 
     @Override
-    public GroupQuery potentialStarter(String procDefId) {
+    public GroupQuery potentialStarter(final String procDefId) {
         throw new UnsupportedOperationException();
     }
 }

Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeSession.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeSession.java?rev=1502221&r1=1502220&r2=1502221&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeSession.java
(original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeSession.java
Thu Jul 11 13:37:43 2013
@@ -22,5 +22,5 @@ import org.activiti.engine.impl.intercep
 
 public interface SyncopeSession extends Session {
 
-    Class<? extends Session> getType();
+    Class<?> getType();
 }

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=1502221&r1=1502220&r2=1502221&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
Thu Jul 11 13:37:43 2013
@@ -21,21 +21,23 @@ package org.apache.syncope.core.workflow
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import org.activiti.engine.identity.Group;
 import org.activiti.engine.identity.User;
 import org.activiti.engine.identity.UserQuery;
-import org.activiti.engine.impl.interceptor.Session;
+import org.activiti.engine.impl.Page;
+import org.activiti.engine.impl.UserQueryImpl;
 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.UserEntityManager;
+import org.activiti.engine.impl.persistence.entity.UserIdentityManager;
 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 UserEntityManager implements SyncopeSession {
+public class SyncopeUserManager implements UserIdentityManager, SyncopeSession {
 
     @Autowired
     private UserDAO userDAO;
@@ -47,8 +49,8 @@ public class SyncopeUserManager extends 
     private EntitlementDAO entitlementDAO;
 
     @Override
-    public Class<? extends Session> getType() {
-        return UserEntityManager.class;
+    public Class<?> getType() {
+        return UserIdentityManager.class;
     }
 
     @Override
@@ -97,6 +99,34 @@ public class SyncopeUserManager extends 
     }
 
     @Override
+    public void flush() {
+    }
+
+    @Override
+    public void close() {
+    }
+
+    @Override
+    public void insertUser(final User user) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void updateUser(final UserEntity updatedUser) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public List<User> findUserByQueryCriteria(final UserQueryImpl query, final Page
page) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public long findUserCountByQueryCriteria(final UserQueryImpl query) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
     public IdentityInfoEntity findUserInfoByUserIdAndKey(final String userId, final String
key) {
         throw new UnsupportedOperationException();
     }
@@ -107,12 +137,19 @@ public class SyncopeUserManager extends 
     }
 
     @Override
-    public void insertUser(final User user) {
+    public List<User> findPotentialStarterUsers(final String proceDefId) {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public void updateUser(final UserEntity updatedUser) {
+    public List<User> findUsersByNativeQuery(final Map<String, Object> parameterMap,
+            final int firstResult, final int maxResults) {
+
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public long findUserCountByNativeQuery(final Map<String, Object> parameterMap)
{
         throw new UnsupportedOperationException();
     }
 }

Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserQueryImpl.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserQueryImpl.java?rev=1502221&r1=1502220&r2=1502221&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserQueryImpl.java
(original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserQueryImpl.java
Thu Jul 11 13:37:43 2013
@@ -81,6 +81,11 @@ public class SyncopeUserQueryImpl implem
     }
 
     @Override
+    public UserQuery userFullNameLike(final String fullNameLike) {
+        return this;
+    }
+
+    @Override
     public UserQuery userEmail(final String email) {
         return this;
     }

Modified: syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java?rev=1502221&r1=1502220&r2=1502221&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java
(original)
+++ syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java
Thu Jul 11 13:37:43 2013
@@ -219,7 +219,7 @@ public abstract class AbstractTest {
 
     // END Spring MVC Initialization
     // BEGIN CXF Initialization
-    public void setupCXFServices() throws Exception {
+    protected void setupCXFServices() throws Exception {
         userService = createServiceInstance(UserService.class);
         userWorkflowService = createServiceInstance(UserWorkflowService.class);
         roleService = createServiceInstance(RoleService.class);
@@ -254,14 +254,14 @@ public abstract class AbstractTest {
         return serviceProxy;
     }
 
-    public WebClient createWebClient(final String path) {
+    protected WebClient createWebClient(final String path) {
         WebClient wc = restClientFactory.createWebClient().to(BASE_URL, false);
         wc.accept(MediaType.APPLICATION_JSON_TYPE).type(MediaType.APPLICATION_JSON_TYPE);
         wc.path(path);
         return wc;
     }
 
-    public void setupContentType(final Client restClient) {
+    protected void setupContentType(final Client restClient) {
         if (contentType == null) {
             String envContentType = System.getProperty(ENV_KEY_CONTENT_TYPE);
             if ((envContentType != null) && (!envContentType.isEmpty())) {
@@ -275,7 +275,7 @@ public abstract class AbstractTest {
 
     // END CXF Initialization
     @SuppressWarnings("unchecked")
-    public <T> T setupCredentials(final T proxy, final Class<?> serviceInterface,
final String username,
+    protected <T> T setupCredentials(final T proxy, final Class<?> serviceInterface,
final String username,
             final String password) {
         if (proxy instanceof SpringServiceProxy) {
             SpringServiceProxy service = (SpringServiceProxy) proxy;
@@ -295,7 +295,7 @@ public abstract class AbstractTest {
         }
     }
 
-    public <T> T getObject(final Response response, final Class<T> type, final
Object serviceProxy) {
+    protected <T> T getObject(final Response response, final Class<T> type, final
Object serviceProxy) {
         assertNotNull(response);
         assertNotNull(response.getLocation());
         if (enabledCXF) {
@@ -309,11 +309,11 @@ public abstract class AbstractTest {
         return restTemplate.getForObject(response.getLocation(), type);
     }
 
-    public void setEnabledCXF(final boolean enabledCXF) {
+    protected void setEnabledCXF(final boolean enabledCXF) {
         this.enabledCXF = enabledCXF;
     }
 
-    public void setContentType(final String contentType) {
+    protected void setContentType(final String contentType) {
         this.contentType = contentType;
     }
 

Modified: syncope/branches/1_1_X/pom.xml
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/pom.xml?rev=1502221&r1=1502220&r2=1502221&view=diff
==============================================================================
--- syncope/branches/1_1_X/pom.xml (original)
+++ syncope/branches/1_1_X/pom.xml Thu Jul 11 13:37:43 2013
@@ -289,18 +289,19 @@ under the License.
     <connid.db.table.version>2.1.5</connid.db.table.version>
     <connid.csvdir.version>0.7</connid.csvdir.version>
     <connid.ldap.version>1.3.6</connid.ldap.version>
+    <connid.ad.version>1.1.1</connid.ad.version>
 
     <commons-jexl.version>2.1.1</commons-jexl.version>
     <commons-lang.version>2.6</commons-lang.version>
         
     <hc.client.version>4.2.5</hc.client.version>
 
-    <activiti.version>5.12.1</activiti.version>
+    <activiti.version>5.13</activiti.version>
 
     <cxf.version>2.7.5</cxf.version>	
     <spring.version>3.2.3.RELEASE</spring.version>
     <spring-security.version>3.1.4.RELEASE</spring-security.version>
-    <aspectj.version>1.7.2.RELEASE</aspectj.version>
+    <aspectj.version>1.7.3</aspectj.version>
     <jackson.version>1.9.12</jackson.version>
     <xstream.version>1.4.4</xstream.version>
     <velocity.version>1.7</velocity.version>
@@ -313,7 +314,7 @@ under the License.
 
     <wicket.version>6.9.0</wicket.version>
 
-    <groovy.version>2.1.4</groovy.version>
+    <groovy.version>2.1.6</groovy.version>
 
     <h2.version>1.3.172</h2.version>
 
@@ -447,6 +448,12 @@ under the License.
         <groupId>org.activiti</groupId>
         <artifactId>activiti-spring</artifactId>            
         <version>${activiti.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+          </exclusion>          
+        </exclusions>
       </dependency>
 
       <dependency>
@@ -922,7 +929,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-war-plugin</artifactId>
-          <version>2.3</version>
+          <version>2.4</version>
           <configuration>
             <attachClasses>true</attachClasses>
             <webResources>
@@ -987,7 +994,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.7</version>
+          <version>2.8</version>
           <configuration>
             <artifactItems>
               <artifactItem>
@@ -1008,6 +1015,12 @@ under the License.
                 <version>${connid.ldap.version}</version>
                 <outputDirectory>${bundles.directory}</outputDirectory>
               </artifactItem>
+              <artifactItem>
+                <groupId>org.connid.bundles</groupId>
+                <artifactId>org.connid.bundles.ad</artifactId>
+                <version>${connid.ad.version}</version>
+                <outputDirectory>${bundles.directory}</outputDirectory>
+              </artifactItem>
             </artifactItems>
           </configuration>
         </plugin>
@@ -1036,12 +1049,12 @@ under the License.
         <plugin>
           <groupId>org.zeroturnaround</groupId>
           <artifactId>jrebel-maven-plugin</artifactId>
-          <version>1.1.3</version>
+          <version>1.1.5</version>
         </plugin>
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
-          <version>2.3.7</version>
+          <version>2.4.0</version>
           <configuration>
             <supportedProjectTypes>
               <supportedProjectType>jar</supportedProjectType>
@@ -1114,7 +1127,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.2</version>
+        <version>1.3</version>
         <executions>
           <execution>
             <id>enforce-java</id>
@@ -1295,7 +1308,7 @@ under the License.
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-site-plugin</artifactId>
-            <version>3.2</version>
+            <version>3.3</version>
             <configuration>
               <locales>en</locales>
               <generateProjectInfo>false</generateProjectInfo>
@@ -1303,7 +1316,7 @@ under the License.
                 <plugin>
                   <groupId>org.apache.maven.plugins</groupId>
                   <artifactId>maven-project-info-reports-plugin</artifactId>
-                  <version>2.6</version>
+                  <version>2.7</version>
                   <configuration>
                     <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
                     <dependencyLocationsEnabled>false</dependencyLocationsEnabled>



Mime
View raw message