You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2012/08/13 09:18:05 UTC
svn commit: r1372285 - in /incubator/syncope/trunk:
core/src/main/java/org/apache/syncope/core/init/
core/src/main/java/org/apache/syncope/core/workflow/activiti/
core/src/main/resources/ core/src/test/resources/ parent/
Author: ilgrosso
Date: Mon Aug 13 07:18:04 2012
New Revision: 1372285
URL: http://svn.apache.org/viewvc?rev=1372285&view=rev
Log:
Upgrading to latest Activiti 5.10
Modified:
incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ActivitiWorkflowLoader.java
incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ContentLoader.java
incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupManager.java
incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupQueryImpl.java
incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserManager.java
incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserQueryImpl.java
incubator/syncope/trunk/core/src/main/resources/content.xml
incubator/syncope/trunk/core/src/test/resources/content.xml
incubator/syncope/trunk/parent/pom.xml
Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ActivitiWorkflowLoader.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ActivitiWorkflowLoader.java?rev=1372285&r1=1372284&r2=1372285&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ActivitiWorkflowLoader.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ActivitiWorkflowLoader.java Mon Aug 13 07:18:04 2012
@@ -23,11 +23,11 @@ import java.io.InputStream;
import java.util.List;
import org.activiti.engine.RepositoryService;
import org.activiti.engine.repository.ProcessDefinition;
+import org.apache.syncope.core.workflow.ActivitiUserWorkflowAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import org.apache.syncope.core.workflow.ActivitiUserWorkflowAdapter;
@Component
public class ActivitiWorkflowLoader {
Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ContentLoader.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ContentLoader.java?rev=1372285&r1=1372284&r2=1372285&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ContentLoader.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ContentLoader.java Mon Aug 13 07:18:04 2012
@@ -24,7 +24,6 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Properties;
-import java.util.logging.Level;
import javax.sql.DataSource;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupManager.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupManager.java?rev=1372285&r1=1372284&r2=1372285&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupManager.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupManager.java Mon Aug 13 07:18:04 2012
@@ -23,15 +23,14 @@ 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.Page;
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.springframework.beans.factory.annotation.Autowired;
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 {
@@ -78,17 +77,6 @@ public class SyncopeGroupManager extends
}
@Override
- public List<Group> findGroupByQueryCriteria(final Object query, final Page page) {
-
- throw new UnsupportedOperationException();
- }
-
- @Override
- public long findGroupCountByQueryCriteria(final Object query) {
- throw new UnsupportedOperationException();
- }
-
- @Override
public List<Group> findGroupsByUser(final String userId) {
List<Group> result = Collections.EMPTY_LIST;
SyncopeUser user = userDAO.find(userId);
Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupQueryImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupQueryImpl.java?rev=1372285&r1=1372284&r2=1372285&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupQueryImpl.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupQueryImpl.java Mon Aug 13 07:18:04 2012
@@ -146,6 +146,11 @@ public class SyncopeGroupQueryImpl imple
@Override
public List<Group> listPage(final int firstResult, final int maxResults) {
+ return list();
+ }
+
+ @Override
+ public GroupQuery potentialStarter(String procDefId) {
throw new UnsupportedOperationException();
}
}
Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserManager.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserManager.java?rev=1372285&r1=1372284&r2=1372285&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserManager.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserManager.java Mon Aug 13 07:18:04 2012
@@ -24,17 +24,16 @@ import java.util.List;
import org.activiti.engine.identity.Group;
import org.activiti.engine.identity.User;
import org.activiti.engine.identity.UserQuery;
-import org.activiti.engine.impl.Page;
import org.activiti.engine.impl.interceptor.Session;
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.springframework.beans.factory.annotation.Autowired;
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 {
@@ -98,17 +97,6 @@ public class SyncopeUserManager extends
}
@Override
- public List<User> findUserByQueryCriteria(final Object query, final Page page) {
-
- throw new UnsupportedOperationException();
- }
-
- @Override
- public long findUserCountByQueryCriteria(final Object query) {
- throw new UnsupportedOperationException();
- }
-
- @Override
public IdentityInfoEntity findUserInfoByUserIdAndKey(final String userId, final String key) {
throw new UnsupportedOperationException();
Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserQueryImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserQueryImpl.java?rev=1372285&r1=1372284&r2=1372285&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserQueryImpl.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserQueryImpl.java Mon Aug 13 07:18:04 2012
@@ -133,7 +133,7 @@ public class SyncopeUserQueryImpl implem
return new UserEntity(syncopeUser.getUsername());
}
- private void execute() {
+ private void execute(int page, int itemsPerPage) {
if (username != null) {
SyncopeUser user = userDAO.find(username);
if (user != null) {
@@ -163,8 +163,11 @@ public class SyncopeUserQueryImpl implem
// THIS CAN BE *VERY* DANGEROUS
if (result == null) {
result = new ArrayList<User>();
- for (SyncopeUser user : userDAO.findAll(EntitlementUtil.getRoleIds(entitlementDAO.findAll()))) {
+ List<SyncopeUser> users = page == -1 && itemsPerPage == -1
+ ? userDAO.findAll(EntitlementUtil.getRoleIds(entitlementDAO.findAll()))
+ : userDAO.findAll(EntitlementUtil.getRoleIds(entitlementDAO.findAll()), page, itemsPerPage);
+ for (SyncopeUser user : users) {
result.add(fromSyncopeUser(user));
}
}
@@ -173,7 +176,7 @@ public class SyncopeUserQueryImpl implem
@Override
public long count() {
if (result == null) {
- execute();
+ execute(-1, -1);
}
return result.size();
}
@@ -181,7 +184,7 @@ public class SyncopeUserQueryImpl implem
@Override
public User singleResult() {
if (result == null) {
- execute();
+ execute(-1, -1);
}
if (result.isEmpty()) {
throw new ActivitiException("Empty result");
@@ -193,13 +196,21 @@ public class SyncopeUserQueryImpl implem
@Override
public List<User> list() {
if (result == null) {
- execute();
+ execute(-1, -1);
}
return result;
}
@Override
public List<User> listPage(final int firstResult, final int maxResults) {
+ if (result == null) {
+ execute((firstResult / maxResults) + 1, maxResults);
+ }
+ return result;
+ }
+
+ @Override
+ public UserQuery potentialStarter(String string) {
throw new UnsupportedOperationException();
}
}
Modified: incubator/syncope/trunk/core/src/main/resources/content.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/resources/content.xml?rev=1372285&r1=1372284&r2=1372285&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/resources/content.xml (original)
+++ incubator/syncope/trunk/core/src/main/resources/content.xml Mon Aug 13 07:18:04 2012
@@ -117,8 +117,8 @@ under the License.
<Entitlement name="AUDIT_ENABLE"/>
<Entitlement name="AUDIT_DISABLE"/>
- <ACT_GE_PROPERTY NAME_="schema.version" VALUE_="5.9" REV_="1"/>
- <ACT_GE_PROPERTY NAME_="schema.history" VALUE_="create(5.9)" REV_="1"/>
+ <ACT_GE_PROPERTY NAME_="schema.version" VALUE_="${activiti.version}" REV_="1"/>
+ <ACT_GE_PROPERTY NAME_="schema.history" VALUE_="create(${activiti.version})" REV_="1"/>
<ACT_GE_PROPERTY NAME_="next.dbid" VALUE_="1" REV_="1"/>
<ACT_GE_PROPERTY NAME_="historyLevel" VALUE_="1" REV_="1"/>
</dataset>
Modified: incubator/syncope/trunk/core/src/test/resources/content.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/test/resources/content.xml?rev=1372285&r1=1372284&r2=1372285&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/test/resources/content.xml (original)
+++ incubator/syncope/trunk/core/src/test/resources/content.xml Mon Aug 13 07:18:04 2012
@@ -692,8 +692,8 @@ under the License.
<SyncopeLogger logName="syncope.audit.authentication.getEntitlements.success" logLevel="DEBUG" logType="AUDIT"/>
- <ACT_GE_PROPERTY NAME_="schema.version" VALUE_="5.9" REV_="1"/>
- <ACT_GE_PROPERTY NAME_="schema.history" VALUE_="create(5.9)" REV_="1"/>
+ <ACT_GE_PROPERTY NAME_="schema.version" VALUE_="${activiti.version}" REV_="1"/>
+ <ACT_GE_PROPERTY NAME_="schema.history" VALUE_="create(${activiti.version})" REV_="1"/>
<ACT_GE_PROPERTY NAME_="next.dbid" VALUE_="1" REV_="1"/>
<ACT_GE_PROPERTY NAME_="historyLevel" VALUE_="1" REV_="1"/>
</dataset>
Modified: incubator/syncope/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/parent/pom.xml?rev=1372285&r1=1372284&r2=1372285&view=diff
==============================================================================
--- incubator/syncope/trunk/parent/pom.xml (original)
+++ incubator/syncope/trunk/parent/pom.xml Mon Aug 13 07:18:04 2012
@@ -243,7 +243,7 @@ under the License.
<httpcomponents.version>4.2.1</httpcomponents.version>
- <activiti.version>5.9</activiti.version>
+ <activiti.version>5.10</activiti.version>
<spring.version>3.1.2.RELEASE</spring.version>
<spring-security.version>3.1.2.RELEASE</spring-security.version>