syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1408249 - in /incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src: main/java/org/apache/syncope/core/init/ main/java/org/apache/syncope/core/policy/ main/java/org/apache/syncope/core/rest/controller/ main/java/org/apache/syncope/core...
Date Mon, 12 Nov 2012 11:36:14 GMT
Author: ilgrosso
Date: Mon Nov 12 11:36:09 2012
New Revision: 1408249

URL: http://svn.apache.org/viewvc?rev=1408249&view=rev
Log:
[SYNCOPE-173][SYNCOPE-219] Moving some classes to new packages as preparation for role-related workflow classes

Added:
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/role/
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/AbstractUserWorkflowAdapter.java
      - copied, changed from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/AbstractUserWorkflowAdapter.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/NoOpUserWorkflowAdapter.java
      - copied, changed from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/NoOpUserWorkflowAdapter.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/UserWorkflowAdapter.java
      - copied, changed from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/UserWorkflowAdapter.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
      - copied, changed from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/ActivitiUserWorkflowAdapter.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiWorkflowLoader.java
      - copied, changed from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/init/ActivitiWorkflowLoader.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeEntitiesVariableType.java
      - copied, changed from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeEntitiesVariableType.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java
      - copied, changed from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupManager.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupQueryImpl.java
      - copied, changed from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupQueryImpl.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeSession.java
      - copied, changed from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeSession.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeSessionFactory.java
      - copied, changed from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeSessionFactory.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java
      - copied, changed from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserManager.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserQueryImpl.java
      - copied, changed from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserQueryImpl.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/AbstractActivitiDelegate.java
      - copied, changed from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/AbstractActivitiDelegate.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/AutoActivate.java
      - copied, changed from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/AutoActivate.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Create.java
      - copied, changed from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/Create.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Delete.java
      - copied, changed from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/Delete.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/GenerateToken.java
      - copied, changed from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/GenerateToken.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Reactivate.java
      - copied, changed from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/Reactivate.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Suspend.java
      - copied, changed from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/Suspend.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Update.java
      - copied, changed from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/Update.java
Removed:
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/init/ActivitiWorkflowLoader.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/AbstractUserWorkflowAdapter.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/ActivitiUserWorkflowAdapter.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/NoOpUserWorkflowAdapter.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/UserWorkflowAdapter.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/
Modified:
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/init/SpringContextInitializer.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/policy/AccountPolicyEnforcer.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/rest/controller/WorkflowController.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/sync/SyncopeSyncResultHanlder.java
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/resources/userWorkflow.bpmn20.xml
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/resources/workflow.properties
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/resources/workflowContext.xml
    incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/test/resources/workflow.properties

Modified: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/init/SpringContextInitializer.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/init/SpringContextInitializer.java?rev=1408249&r1=1408248&r2=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/init/SpringContextInitializer.java (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/init/SpringContextInitializer.java Mon Nov 12 11:36:09 2012
@@ -22,8 +22,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 import javax.servlet.ServletContext;
-import org.apache.syncope.core.workflow.ActivitiUserWorkflowAdapter;
-import org.apache.syncope.core.workflow.UserWorkflowAdapter;
+import org.apache.syncope.core.workflow.user.activiti.ActivitiUserWorkflowAdapter;
+import org.apache.syncope.core.workflow.user.UserWorkflowAdapter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;

Modified: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/policy/AccountPolicyEnforcer.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/policy/AccountPolicyEnforcer.java?rev=1408249&r1=1408248&r2=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/policy/AccountPolicyEnforcer.java (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/policy/AccountPolicyEnforcer.java Mon Nov 12 11:36:09 2012
@@ -28,7 +28,7 @@ import org.apache.syncope.core.persisten
 import org.apache.syncope.core.propagation.PropagationManager;
 import org.apache.syncope.core.propagation.PropagationTaskExecutor;
 import org.apache.syncope.core.rest.data.UserDataBinder;
-import org.apache.syncope.core.workflow.UserWorkflowAdapter;
+import org.apache.syncope.core.workflow.user.UserWorkflowAdapter;
 import org.apache.syncope.core.workflow.WorkflowResult;
 import org.apache.syncope.types.AccountPolicySpec;
 import org.apache.syncope.types.PolicyType;

Modified: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java?rev=1408249&r1=1408248&r2=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java Mon Nov 12 11:36:09 2012
@@ -46,9 +46,9 @@ import org.apache.syncope.core.rest.data
 import org.apache.syncope.core.util.ConnObjectUtil;
 import org.apache.syncope.core.util.EntitlementUtil;
 import org.apache.syncope.core.util.NotFoundException;
-import org.apache.syncope.core.workflow.UserWorkflowAdapter;
 import org.apache.syncope.core.workflow.WorkflowException;
 import org.apache.syncope.core.workflow.WorkflowResult;
+import org.apache.syncope.core.workflow.user.UserWorkflowAdapter;
 import org.apache.syncope.types.AuditElements.Category;
 import org.apache.syncope.types.AuditElements.Result;
 import org.apache.syncope.types.AuditElements.UserSubCategory;

Modified: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/rest/controller/WorkflowController.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/rest/controller/WorkflowController.java?rev=1408249&r1=1408248&r2=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/rest/controller/WorkflowController.java (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/rest/controller/WorkflowController.java Mon Nov 12 11:36:09 2012
@@ -22,7 +22,7 @@ import java.util.List;
 import org.apache.syncope.client.to.WorkflowDefinitionTO;
 import org.apache.syncope.core.audit.AuditManager;
 import org.apache.syncope.core.util.NotFoundException;
-import org.apache.syncope.core.workflow.UserWorkflowAdapter;
+import org.apache.syncope.core.workflow.user.UserWorkflowAdapter;
 import org.apache.syncope.core.workflow.WorkflowException;
 import org.apache.syncope.types.AuditElements.Category;
 import org.apache.syncope.types.AuditElements.Result;

Modified: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/sync/SyncopeSyncResultHanlder.java
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/sync/SyncopeSyncResultHanlder.java?rev=1408249&r1=1408248&r2=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/sync/SyncopeSyncResultHanlder.java (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/sync/SyncopeSyncResultHanlder.java Mon Nov 12 11:36:09 2012
@@ -51,7 +51,7 @@ import org.apache.syncope.core.rest.data
 import org.apache.syncope.core.util.ConnObjectUtil;
 import org.apache.syncope.core.util.EntitlementUtil;
 import org.apache.syncope.core.util.NotFoundException;
-import org.apache.syncope.core.workflow.UserWorkflowAdapter;
+import org.apache.syncope.core.workflow.user.UserWorkflowAdapter;
 import org.apache.syncope.core.workflow.WorkflowResult;
 import org.apache.syncope.types.ConflictResolutionAction;
 import org.apache.syncope.types.SyncPolicySpec;

Copied: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/AbstractUserWorkflowAdapter.java (from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/AbstractUserWorkflowAdapter.java)
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/AbstractUserWorkflowAdapter.java?p2=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/AbstractUserWorkflowAdapter.java&p1=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/AbstractUserWorkflowAdapter.java&r1=1408178&r2=1408249&rev=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/AbstractUserWorkflowAdapter.java (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/AbstractUserWorkflowAdapter.java Mon Nov 12 11:36:09 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.workflow;
+package org.apache.syncope.core.workflow.user;
 
 import java.util.Map;
 import java.util.Map.Entry;
@@ -28,6 +28,8 @@ import org.apache.syncope.core.persisten
 import org.apache.syncope.core.rest.controller.UnauthorizedRoleException;
 import org.apache.syncope.core.rest.data.UserDataBinder;
 import org.apache.syncope.core.util.NotFoundException;
+import org.apache.syncope.core.workflow.WorkflowException;
+import org.apache.syncope.core.workflow.WorkflowResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 

Copied: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/NoOpUserWorkflowAdapter.java (from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/NoOpUserWorkflowAdapter.java)
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/NoOpUserWorkflowAdapter.java?p2=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/NoOpUserWorkflowAdapter.java&p1=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/NoOpUserWorkflowAdapter.java&r1=1408178&r2=1408249&rev=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/NoOpUserWorkflowAdapter.java (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/NoOpUserWorkflowAdapter.java Mon Nov 12 11:36:09 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.workflow;
+package org.apache.syncope.core.workflow.user;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -31,6 +31,8 @@ import org.apache.syncope.core.persisten
 import org.apache.syncope.core.propagation.PropagationByResource;
 import org.apache.syncope.core.rest.controller.UnauthorizedRoleException;
 import org.apache.syncope.core.util.NotFoundException;
+import org.apache.syncope.core.workflow.WorkflowException;
+import org.apache.syncope.core.workflow.WorkflowResult;
 import org.apache.syncope.types.PropagationOperation;
 import org.springframework.transaction.annotation.Transactional;
 

Copied: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/UserWorkflowAdapter.java (from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/UserWorkflowAdapter.java)
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/UserWorkflowAdapter.java?p2=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/UserWorkflowAdapter.java&p1=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/UserWorkflowAdapter.java&r1=1408178&r2=1408249&rev=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/UserWorkflowAdapter.java (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/UserWorkflowAdapter.java Mon Nov 12 11:36:09 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.workflow;
+package org.apache.syncope.core.workflow.user;
 
 import java.util.List;
 import java.util.Map;
@@ -29,6 +29,8 @@ import org.apache.syncope.core.init.Work
 import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
 import org.apache.syncope.core.rest.controller.UnauthorizedRoleException;
 import org.apache.syncope.core.util.NotFoundException;
+import org.apache.syncope.core.workflow.WorkflowException;
+import org.apache.syncope.core.workflow.WorkflowResult;
 
 /**
  * Interface for calling underlying workflow implementations.

Copied: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java (from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/ActivitiUserWorkflowAdapter.java)
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java?p2=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java&p1=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/ActivitiUserWorkflowAdapter.java&r1=1408178&r2=1408249&rev=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/ActivitiUserWorkflowAdapter.java (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java Mon Nov 12 11:36:09 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.workflow;
+package org.apache.syncope.core.workflow.user.activiti;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -59,12 +59,14 @@ import org.apache.syncope.client.to.User
 import org.apache.syncope.client.to.WorkflowDefinitionTO;
 import org.apache.syncope.client.to.WorkflowFormPropertyTO;
 import org.apache.syncope.client.to.WorkflowFormTO;
-import org.apache.syncope.core.init.ActivitiWorkflowLoader;
 import org.apache.syncope.core.init.WorkflowLoader;
 import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
 import org.apache.syncope.core.propagation.PropagationByResource;
 import org.apache.syncope.core.rest.controller.UnauthorizedRoleException;
 import org.apache.syncope.core.util.NotFoundException;
+import org.apache.syncope.core.workflow.WorkflowException;
+import org.apache.syncope.core.workflow.WorkflowResult;
+import org.apache.syncope.core.workflow.user.AbstractUserWorkflowAdapter;
 import org.apache.syncope.types.PropagationOperation;
 import org.apache.syncope.types.WorkflowFormPropertyType;
 import org.identityconnectors.common.security.EncryptorFactory;

Copied: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiWorkflowLoader.java (from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/init/ActivitiWorkflowLoader.java)
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiWorkflowLoader.java?p2=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiWorkflowLoader.java&p1=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/init/ActivitiWorkflowLoader.java&r1=1408178&r2=1408249&rev=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/init/ActivitiWorkflowLoader.java (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiWorkflowLoader.java Mon Nov 12 11:36:09 2012
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.init;
+package org.apache.syncope.core.workflow.user.activiti;
 
 import java.io.IOException;
 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.apache.syncope.core.init.WorkflowLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

Copied: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeEntitiesVariableType.java (from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeEntitiesVariableType.java)
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeEntitiesVariableType.java?p2=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeEntitiesVariableType.java&p1=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeEntitiesVariableType.java&r1=1408178&r2=1408249&rev=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeEntitiesVariableType.java (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeEntitiesVariableType.java Mon Nov 12 11:36:09 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.workflow.activiti;
+package org.apache.syncope.core.workflow.user.activiti;
 
 import org.activiti.engine.impl.variable.SerializableType;
 import org.apache.syncope.core.persistence.beans.AbstractBaseBean;

Copied: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java (from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupManager.java)
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java?p2=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java&p1=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupManager.java&r1=1408178&r2=1408249&rev=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupManager.java (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupManager.java Mon Nov 12 11:36:09 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.workflow.activiti;
+package org.apache.syncope.core.workflow.user.activiti;
 
 import java.util.ArrayList;
 import java.util.Collections;

Copied: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupQueryImpl.java (from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupQueryImpl.java)
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupQueryImpl.java?p2=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupQueryImpl.java&p1=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupQueryImpl.java&r1=1408178&r2=1408249&rev=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupQueryImpl.java (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeGroupQueryImpl.java Mon Nov 12 11:36:09 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.workflow.activiti;
+package org.apache.syncope.core.workflow.user.activiti;
 
 import java.util.ArrayList;
 import java.util.Collections;

Copied: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeSession.java (from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeSession.java)
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeSession.java?p2=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeSession.java&p1=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeSession.java&r1=1408178&r2=1408249&rev=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeSession.java (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeSession.java Mon Nov 12 11:36:09 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.workflow.activiti;
+package org.apache.syncope.core.workflow.user.activiti;
 
 import org.activiti.engine.impl.interceptor.Session;
 

Copied: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeSessionFactory.java (from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeSessionFactory.java)
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeSessionFactory.java?p2=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeSessionFactory.java&p1=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeSessionFactory.java&r1=1408178&r2=1408249&rev=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeSessionFactory.java (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeSessionFactory.java Mon Nov 12 11:36:09 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.workflow.activiti;
+package org.apache.syncope.core.workflow.user.activiti;
 
 import org.activiti.engine.impl.interceptor.Session;
 import org.activiti.engine.impl.interceptor.SessionFactory;

Copied: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java (from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserManager.java)
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java?p2=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java&p1=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserManager.java&r1=1408178&r2=1408249&rev=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserManager.java (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserManager.java Mon Nov 12 11:36:09 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.workflow.activiti;
+package org.apache.syncope.core.workflow.user.activiti;
 
 import java.util.ArrayList;
 import java.util.Collections;

Copied: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserQueryImpl.java (from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserQueryImpl.java)
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserQueryImpl.java?p2=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserQueryImpl.java&p1=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserQueryImpl.java&r1=1408178&r2=1408249&rev=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserQueryImpl.java (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/SyncopeUserQueryImpl.java Mon Nov 12 11:36:09 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.workflow.activiti;
+package org.apache.syncope.core.workflow.user.activiti;
 
 import java.util.ArrayList;
 import java.util.Collections;

Copied: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/AbstractActivitiDelegate.java (from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/AbstractActivitiDelegate.java)
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/AbstractActivitiDelegate.java?p2=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/AbstractActivitiDelegate.java&p1=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/AbstractActivitiDelegate.java&r1=1408178&r2=1408249&rev=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/AbstractActivitiDelegate.java (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/AbstractActivitiDelegate.java Mon Nov 12 11:36:09 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.workflow.activiti;
+package org.apache.syncope.core.workflow.user.activiti.task;
 
 import org.activiti.engine.TaskService;
 import org.activiti.engine.delegate.DelegateExecution;

Copied: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/AutoActivate.java (from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/AutoActivate.java)
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/AutoActivate.java?p2=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/AutoActivate.java&p1=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/AutoActivate.java&r1=1408178&r2=1408249&rev=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/AutoActivate.java (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/AutoActivate.java Mon Nov 12 11:36:09 2012
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.workflow.activiti;
+package org.apache.syncope.core.workflow.user.activiti.task;
 
 import org.activiti.engine.delegate.DelegateExecution;
-import org.apache.syncope.core.workflow.ActivitiUserWorkflowAdapter;
+import org.apache.syncope.core.workflow.user.activiti.ActivitiUserWorkflowAdapter;
 
 public class AutoActivate extends AbstractActivitiDelegate {
 

Copied: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Create.java (from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/Create.java)
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Create.java?p2=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Create.java&p1=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/Create.java&r1=1408178&r2=1408249&rev=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/Create.java (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Create.java Mon Nov 12 11:36:09 2012
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.workflow.activiti;
+package org.apache.syncope.core.workflow.user.activiti.task;
 
 import org.activiti.engine.delegate.DelegateExecution;
 import org.apache.syncope.client.to.UserTO;
 import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
-import org.apache.syncope.core.workflow.ActivitiUserWorkflowAdapter;
+import org.apache.syncope.core.workflow.user.activiti.ActivitiUserWorkflowAdapter;
 
 public class Create extends AbstractActivitiDelegate {
 

Copied: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Delete.java (from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/Delete.java)
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Delete.java?p2=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Delete.java&p1=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/Delete.java&r1=1408178&r2=1408249&rev=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/Delete.java (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Delete.java Mon Nov 12 11:36:09 2012
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.workflow.activiti;
+package org.apache.syncope.core.workflow.user.activiti.task;
 
 import org.activiti.engine.delegate.DelegateExecution;
 import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
-import org.apache.syncope.core.workflow.ActivitiUserWorkflowAdapter;
+import org.apache.syncope.core.workflow.user.activiti.ActivitiUserWorkflowAdapter;
 
 public class Delete extends AbstractActivitiDelegate {
 

Copied: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/GenerateToken.java (from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/GenerateToken.java)
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/GenerateToken.java?p2=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/GenerateToken.java&p1=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/GenerateToken.java&r1=1408178&r2=1408249&rev=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/GenerateToken.java (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/GenerateToken.java Mon Nov 12 11:36:09 2012
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.workflow.activiti;
+package org.apache.syncope.core.workflow.user.activiti.task;
 
 import org.activiti.engine.delegate.DelegateExecution;
 import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
-import org.apache.syncope.core.workflow.ActivitiUserWorkflowAdapter;
+import org.apache.syncope.core.workflow.user.activiti.ActivitiUserWorkflowAdapter;
 
 public class GenerateToken extends AbstractActivitiDelegate {
 

Copied: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Reactivate.java (from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/Reactivate.java)
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Reactivate.java?p2=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Reactivate.java&p1=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/Reactivate.java&r1=1408178&r2=1408249&rev=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/Reactivate.java (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Reactivate.java Mon Nov 12 11:36:09 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.workflow.activiti;
+package org.apache.syncope.core.workflow.user.activiti.task;
 
 import org.activiti.engine.delegate.DelegateExecution;
 

Copied: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Suspend.java (from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/Suspend.java)
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Suspend.java?p2=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Suspend.java&p1=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/Suspend.java&r1=1408178&r2=1408249&rev=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/Suspend.java (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Suspend.java Mon Nov 12 11:36:09 2012
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.workflow.activiti;
+package org.apache.syncope.core.workflow.user.activiti.task;
 
 import org.activiti.engine.delegate.DelegateExecution;
 

Copied: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Update.java (from r1408178, incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/Update.java)
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Update.java?p2=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Update.java&p1=incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/Update.java&r1=1408178&r2=1408249&rev=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/activiti/Update.java (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/Update.java Mon Nov 12 11:36:09 2012
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.workflow.activiti;
+package org.apache.syncope.core.workflow.user.activiti.task;
 
 import org.activiti.engine.delegate.DelegateExecution;
 import org.apache.syncope.client.mod.UserMod;
 import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
 import org.apache.syncope.core.propagation.PropagationByResource;
-import org.apache.syncope.core.workflow.ActivitiUserWorkflowAdapter;
+import org.apache.syncope.core.workflow.user.activiti.ActivitiUserWorkflowAdapter;
 
 public class Update extends AbstractActivitiDelegate {
 

Modified: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/resources/userWorkflow.bpmn20.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/resources/userWorkflow.bpmn20.xml?rev=1408249&r1=1408248&r2=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/resources/userWorkflow.bpmn20.xml (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/resources/userWorkflow.bpmn20.xml Mon Nov 12 11:36:09 2012
@@ -35,7 +35,8 @@ under the License.
     <!-- Create an user -->
     <sequenceFlow id="flow1" sourceRef="theStart" targetRef="create"/>
       
-    <serviceTask id="create" name="Create" activiti:class="org.apache.syncope.core.workflow.activiti.Create"/>
+    <serviceTask id="create" name="Create" 
+                 activiti:class="org.apache.syncope.core.workflow.user.activiti.task.Create"/>
 
     <sequenceFlow id="flow2" sourceRef="create" targetRef="createGW"/>
         
@@ -81,12 +82,13 @@ under the License.
       <conditionExpression xsi:type="tFormalExpression">${!enabled}</conditionExpression>
     </sequenceFlow>
     
-    <serviceTask id="activate" name="Activate" activiti:class="org.apache.syncope.core.workflow.activiti.AutoActivate"/>
+    <serviceTask id="activate" name="Activate" 
+                 activiti:class="org.apache.syncope.core.workflow.user.activiti.task.AutoActivate"/>
     <sequenceFlow id="flow4" sourceRef="activate" targetRef="active"/>
 
     <!-- Double opt-in required -->
     <serviceTask id="generateToken" name="Generate token" 
-                 activiti:class="org.apache.syncope.core.workflow.activiti.GenerateToken"/>
+                 activiti:class="org.apache.syncope.core.workflow.user.activiti.task.GenerateToken"/>
         
     <sequenceFlow id="flow5" sourceRef="generateToken" targetRef="created"/>
 
@@ -126,12 +128,14 @@ under the License.
     </sequenceFlow>
 
     <!-- Update an active user -->
-    <serviceTask id="update" name="Update" activiti:class="org.apache.syncope.core.workflow.activiti.Update"/>
+    <serviceTask id="update" name="Update" 
+                 activiti:class="org.apache.syncope.core.workflow.user.activiti.task.Update"/>
 
     <sequenceFlow id="flow9" sourceRef="update" targetRef="active"/>
 
     <!-- Suspend an active user -->
-    <serviceTask id="suspend" name="Suspend" activiti:class="org.apache.syncope.core.workflow.activiti.Suspend"/>
+    <serviceTask id="suspend" name="Suspend" 
+                 activiti:class="org.apache.syncope.core.workflow.user.activiti.task.Suspend"/>
 
     <sequenceFlow id="flow10" sourceRef="suspend" targetRef="suspended"/>
 
@@ -148,7 +152,8 @@ under the License.
     </sequenceFlow>
 
     <!-- Reactivate a suspended user -->
-    <serviceTask id="reactivate" name ="Reactivate" activiti:class="org.apache.syncope.core.workflow.activiti.Reactivate"/>
+    <serviceTask id="reactivate" name ="Reactivate" 
+                 activiti:class="org.apache.syncope.core.workflow.user.activiti.task.Reactivate"/>
 
     <sequenceFlow id="flow12" sourceRef="reactivate" targetRef="active"/>
         
@@ -167,7 +172,8 @@ under the License.
     <sequenceFlow id="flow14" sourceRef="rejected" targetRef="delete"/>
 
     <!-- Delete an user (created, active or suspended) -->
-    <serviceTask id="delete" name="Delete" activiti:class="org.apache.syncope.core.workflow.activiti.Delete"/>
+    <serviceTask id="delete" name="Delete" 
+                 activiti:class="org.apache.syncope.core.workflow.user.activiti.task.Delete"/>
 
     <sequenceFlow id="flow99" sourceRef="delete" targetRef="theEnd"/>
 

Modified: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/resources/workflow.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/resources/workflow.properties?rev=1408249&r1=1408248&r2=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/resources/workflow.properties (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/resources/workflow.properties Mon Nov 12 11:36:09 2012
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-wfAdapter=org.apache.syncope.core.workflow.ActivitiUserWorkflowAdapter
-jobExecutorActivate=true
\ No newline at end of file
+wfAdapter=org.apache.syncope.core.workflow.user.activiti.ActivitiUserWorkflowAdapter
+jobExecutorActivate=true

Modified: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/resources/workflowContext.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/resources/workflowContext.xml?rev=1408249&r1=1408248&r2=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/resources/workflowContext.xml (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/main/resources/workflowContext.xml Mon Nov 12 11:36:09 2012
@@ -29,8 +29,8 @@ under the License.
     
   <bean id="wfAdapter" class="${wfAdapter}"/>
 
-  <bean id="syncopeActivitiUserManager" class="org.apache.syncope.core.workflow.activiti.SyncopeUserManager"/>
-  <bean id="syncopeActivitiGroupManager" class="org.apache.syncope.core.workflow.activiti.SyncopeGroupManager"/>
+  <bean id="syncopeActivitiUserManager" class="org.apache.syncope.core.workflow.user.activiti.SyncopeUserManager"/>
+  <bean id="syncopeActivitiGroupManager" class="org.apache.syncope.core.workflow.user.activiti.SyncopeGroupManager"/>
                 
   <bean id="processEngineConfiguration" class="org.activiti.spring.SpringProcessEngineConfiguration">
     <property name="dataSource" ref="dataSource" />
@@ -46,17 +46,17 @@ under the License.
         
     <property name="customSessionFactories">
       <list>          
-        <bean class="org.apache.syncope.core.workflow.activiti.SyncopeSessionFactory">
+        <bean class="org.apache.syncope.core.workflow.user.activiti.SyncopeSessionFactory">
           <property name="syncopeSession" ref="syncopeActivitiUserManager"/>
         </bean>
-        <bean class="org.apache.syncope.core.workflow.activiti.SyncopeSessionFactory">
+        <bean class="org.apache.syncope.core.workflow.user.activiti.SyncopeSessionFactory">
           <property name="syncopeSession" ref="syncopeActivitiGroupManager"/>
         </bean>
       </list>
     </property>
     <property name="customPreVariableTypes">
       <list>
-        <bean class="org.apache.syncope.core.workflow.activiti.SyncopeEntitiesVariableType"/>
+        <bean class="org.apache.syncope.core.workflow.user.activiti.SyncopeEntitiesVariableType"/>
       </list>    
     </property>
   </bean>
@@ -81,4 +81,4 @@ under the License.
       </value>
     </property>
   </bean>
-</beans>
\ No newline at end of file
+</beans>

Modified: incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/test/resources/workflow.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/test/resources/workflow.properties?rev=1408249&r1=1408248&r2=1408249&view=diff
==============================================================================
--- incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/test/resources/workflow.properties (original)
+++ incubator/syncope/branches/DEV_ROLE_PROVISIONING/core/src/test/resources/workflow.properties Mon Nov 12 11:36:09 2012
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-wfAdapter=org.apache.syncope.core.workflow.ActivitiUserWorkflowAdapter
-jobExecutorActivate=false
\ No newline at end of file
+wfAdapter=org.apache.syncope.core.workflow.user.activiti.ActivitiUserWorkflowAdapter
+jobExecutorActivate=false



Mime
View raw message