Repository: syncope Updated Branches: refs/heads/2_0_X 0f9194eb7 -> 702810d8b
http://git-wip-us.apache.org/repos/asf/syncope/blob/702810d8/syncope620/server/workflow-activiti/src/main/resources/userWorkflow.bpmn20.xml ---------------------------------------------------------------------- diff --git a/syncope620/server/workflow-activiti/src/main/resources/userWorkflow.bpmn20.xml b/syncope620/server/workflow-activiti/src/main/resources/userWorkflow.bpmn20.xml new file mode 100644 index 0000000..510ce9f --- /dev/null +++ b/syncope620/server/workflow-activiti/src/main/resources/userWorkflow.bpmn20.xml @@ -0,0 +1,232 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:activiti="http://activiti.org/bpmn"; + xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI"; + xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC"; + xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI"; + typeLanguage="http://www.w3.org/2001/XMLSchema"; + expressionLanguage="http://www.w3.org/1999/XPath"; + targetNamespace="http://activiti.org/bpmn20";> + + <process id="userWorkflow" name="User Workflow" isExecutable="true"> + <startEvent id="theStart"/> + <sequenceFlow id="flow1" sourceRef="theStart" targetRef="create"/> + <serviceTask id="create" name="Create" activiti:expression="#{create.execute(execution.processInstanceId)}"/> + <sequenceFlow id="flow2" sourceRef="create" targetRef="activate"/> + <scriptTask id="activate" name="Activate" scriptFormat="groovy" activiti:autoStoreVariables="false"> + <script>execution.setVariable("propagateEnable", Boolean.TRUE);</script> + </scriptTask> + <sequenceFlow id="flow3" sourceRef="activate" targetRef="active"/> + <userTask id="active" name="Active"/> + <sequenceFlow id="flow8" sourceRef="active" targetRef="activeGw"/> + <exclusiveGateway id="activeGw"/> + <sequenceFlow id="active2Update" sourceRef="activeGw" targetRef="update"> + <conditionExpression xsi:type="tFormalExpression"><![CDATA[${task == 'update'}]]></conditionExpression> + </sequenceFlow> + <sequenceFlow id="active2Suspend" sourceRef="activeGw" targetRef="suspend"> + <conditionExpression xsi:type="tFormalExpression"><![CDATA[${task == 'suspend'}]]></conditionExpression> + </sequenceFlow> + <sequenceFlow id="active2Delete" sourceRef="activeGw" targetRef="delete"> + <conditionExpression xsi:type="tFormalExpression"><![CDATA[${task == 'delete'}]]></conditionExpression> + </sequenceFlow> + <sequenceFlow id="active2RequestPasswordReset" sourceRef="activeGw" targetRef="generateToken4PasswordReset"> + <conditionExpression xsi:type="tFormalExpression"><![CDATA[${task == 'requestPasswordReset'}]]></conditionExpression> + </sequenceFlow> + <sequenceFlow id="active2ConfirmPasswordReset" sourceRef="activeGw" targetRef="checkToken4ConfirmPasswordReset"> + <conditionExpression xsi:type="tFormalExpression"><![CDATA[${task == 'confirmPasswordReset'}]]></conditionExpression> + </sequenceFlow> + <serviceTask id="update" name="Update" activiti:expression="#{update.execute(execution.processInstanceId)}"/> + <sequenceFlow id="sid-EA22026A-25F0-4ED0-AB6E-9CE9CE74623C" sourceRef="update" targetRef="active"/> + <serviceTask id="suspend" name="Suspend" activiti:expression="#{suspend.execute(execution.processInstanceId)}"/> + <sequenceFlow id="flow10" sourceRef="suspend" targetRef="suspended"/> + <userTask id="suspended" name="Suspended"/> + <sequenceFlow id="flow11" sourceRef="suspended" targetRef="suspendedGw"/> + <exclusiveGateway id="suspendedGw"/> + <sequenceFlow id="suspended2Reactivate" sourceRef="suspendedGw" targetRef="reactivate"> + <conditionExpression xsi:type="tFormalExpression"><![CDATA[${task == 'reactivate'}]]></conditionExpression> + </sequenceFlow> + <sequenceFlow id="suspended2Delete" sourceRef="suspendedGw" targetRef="delete"> + <conditionExpression xsi:type="tFormalExpression"><![CDATA[${task == 'delete'}]]></conditionExpression> + </sequenceFlow> + <serviceTask id="reactivate" name="Reactivate" activiti:expression="#{reactivate.execute(execution.processInstanceId)}"/> + <sequenceFlow id="flow12" sourceRef="reactivate" targetRef="active"/> + + <serviceTask id="generateToken4PasswordReset" name="Generate Token" activiti:expression="#{generateToken.execute(execution.processInstanceId)}"/> + <sequenceFlow id="sid-7F78CE07-A7A1-467F-BB4B-40FB234AEFF7" sourceRef="generateToken4PasswordReset" targetRef="notify4RequestPasswordReset"/> + <serviceTask id="notify4RequestPasswordReset" name="Notification" activiti:expression="#{notify.execute(execution.processInstanceId)}"/> + <sequenceFlow id="sid-CF9ACA40-7750-47C3-A508-7250D24D4F1F" sourceRef="notify4RequestPasswordReset" targetRef="active"/> + + <serviceTask id="checkToken4ConfirmPasswordReset" name="Check token, remove and update password" activiti:expression="#{passwordReset.execute(execution.processInstanceId)}"/> + <sequenceFlow id="sid-3E9FE01D-CC60-4A95-B356-CA0DC000FAD6" sourceRef="checkToken4ConfirmPasswordReset" targetRef="notify4ConfirmPasswordReset"/> + <serviceTask id="notify4ConfirmPasswordReset" name="Notification" activiti:expression="#{notify.execute(execution.processInstanceId)}"/> + <sequenceFlow id="sid-A37806A7-6B7B-48A2-BB37-DAE640231144" sourceRef="notify4ConfirmPasswordReset" targetRef="active"/> + + <serviceTask id="delete" name="Delete" activiti:expression="#{delete.execute(execution.processInstanceId)}"/> + <sequenceFlow id="flow99" sourceRef="delete" targetRef="theEnd"/> + <endEvent id="theEnd"/> + </process> + + <bpmndi:BPMNDiagram id="BPMNDiagram_userWorkflow"> + <bpmndi:BPMNPlane bpmnElement="userWorkflow" id="BPMNPlane_userWorkflow"> + <bpmndi:BPMNShape bpmnElement="theStart" id="BPMNShape_theStart"> + <omgdc:Bounds height="30.0" width="30.0" x="540.0" y="525.0"/> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape bpmnElement="create" id="BPMNShape_create"> + <omgdc:Bounds height="60.00000000000006" width="100.0" x="620.0" y="509.99999999999994"/> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape bpmnElement="active" id="BPMNShape_active"> + <omgdc:Bounds height="60.0" width="100.0" x="1030.0" y="511.0"/> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape bpmnElement="activeGw" id="BPMNShape_activeGw"> + <omgdc:Bounds height="40.0" width="40.0" x="1400.0" y="520.0"/> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape bpmnElement="update" id="BPMNShape_update"> + <omgdc:Bounds height="60.0" width="100.0" x="1370.0" y="615.0"/> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape bpmnElement="suspend" id="BPMNShape_suspend"> + <omgdc:Bounds height="60.0" width="100.0" x="1490.0" y="370.0"/> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape bpmnElement="suspended" id="BPMNShape_suspended"> + <omgdc:Bounds height="60.0" width="100.0" x="1640.0" y="370.0"/> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape bpmnElement="suspendedGw" id="BPMNShape_suspendedGw"> + <omgdc:Bounds height="40.0" width="40.0" x="1820.0" y="380.0"/> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape bpmnElement="reactivate" id="BPMNShape_reactivate"> + <omgdc:Bounds height="60.0" width="100.0" x="1940.0" y="290.0"/> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape bpmnElement="generateToken4PasswordReset" id="BPMNShape_generateToken4PasswordReset"> + <omgdc:Bounds height="81.0" width="121.0" x="1515.0" y="604.5"/> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape bpmnElement="notify4RequestPasswordReset" id="BPMNShape_notify4RequestPasswordReset"> + <omgdc:Bounds height="81.0" width="121.0" x="1515.0" y="750.0"/> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape bpmnElement="checkToken4ConfirmPasswordReset" id="BPMNShape_checkToken4ConfirmPasswordReset"> + <omgdc:Bounds height="81.0" width="121.0" x="1725.0" y="664.5"/> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape bpmnElement="notify4ConfirmPasswordReset" id="BPMNShape_notify4ConfirmPasswordReset"> + <omgdc:Bounds height="81.0" width="121.0" x="1725.0" y="810.0"/> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape bpmnElement="delete" id="BPMNShape_delete"> + <omgdc:Bounds height="60.0" width="100.0" x="1940.0" y="438.0"/> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape bpmnElement="theEnd" id="BPMNShape_theEnd"> + <omgdc:Bounds height="28.0" width="28.0" x="2080.0" y="451.0"/> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape bpmnElement="activate" id="BPMNShape_activate"> + <omgdc:Bounds height="80.0" width="100.0" x="828.286878319943" y="500.0"/> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge bpmnElement="flow12" id="BPMNEdge_flow12"> + <omgdi:waypoint x="1990.0" y="290.0"/> + <omgdi:waypoint x="1990.0" y="261.0"/> + <omgdi:waypoint x="1080.0" y="261.0"/> + <omgdi:waypoint x="1080.0" y="511.0"/> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge bpmnElement="flow11" id="BPMNEdge_flow11"> + <omgdi:waypoint x="1740.0" y="400.0"/> + <omgdi:waypoint x="1820.0" y="400.0"/> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge bpmnElement="flow10" id="BPMNEdge_flow10"> + <omgdi:waypoint x="1590.0" y="400.0"/> + <omgdi:waypoint x="1640.0" y="400.0"/> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge bpmnElement="active2Suspend" id="BPMNEdge_active2Suspend"> + <omgdi:waypoint x="1440.0" y="540.0"/> + <omgdi:waypoint x="1540.0" y="540.0"/> + <omgdi:waypoint x="1540.0" y="430.0"/> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge bpmnElement="sid-A37806A7-6B7B-48A2-BB37-DAE640231144" id="BPMNEdge_sid-A37806A7-6B7B-48A2-BB37-DAE640231144"> + <omgdi:waypoint x="1725.0" y="850.4571226080794"/> + <omgdi:waypoint x="1080.0" y="850.0"/> + <omgdi:waypoint x="1080.0" y="571.0"/> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge bpmnElement="suspended2Delete" id="BPMNEdge_suspended2Delete"> + <omgdi:waypoint x="1860.0" y="400.0"/> + <omgdi:waypoint x="1990.0" y="400.0"/> + <omgdi:waypoint x="1990.0" y="438.0"/> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge bpmnElement="active2RequestPasswordReset" id="BPMNEdge_active2RequestPasswordReset"> + <omgdi:waypoint x="1440.0" y="540.0"/> + <omgdi:waypoint x="1575.0" y="540.0"/> + <omgdi:waypoint x="1575.307142857143" y="604.5"/> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge bpmnElement="active2Delete" id="BPMNEdge_active2Delete"> + <omgdi:waypoint x="1440.0" y="540.0"/> + <omgdi:waypoint x="1990.0" y="540.0"/> + <omgdi:waypoint x="1990.0" y="498.0"/> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge bpmnElement="flow2" id="BPMNEdge_flow2"> + <omgdi:waypoint x="720.0" y="540.0"/> + <omgdi:waypoint x="828.286878319943" y="540.0"/> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge bpmnElement="sid-3E9FE01D-CC60-4A95-B356-CA0DC000FAD6" id="BPMNEdge_sid-3E9FE01D-CC60-4A95-B356-CA0DC000FAD6"> + <omgdi:waypoint x="1785.5" y="745.5"/> + <omgdi:waypoint x="1785.5" y="810.0"/> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge bpmnElement="sid-7F78CE07-A7A1-467F-BB4B-40FB234AEFF7" id="BPMNEdge_sid-7F78CE07-A7A1-467F-BB4B-40FB234AEFF7"> + <omgdi:waypoint x="1575.5" y="685.5"/> + <omgdi:waypoint x="1575.5" y="750.0"/> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge bpmnElement="sid-EA22026A-25F0-4ED0-AB6E-9CE9CE74623C" id="BPMNEdge_sid-EA22026A-25F0-4ED0-AB6E-9CE9CE74623C"> + <omgdi:waypoint x="1370.0" y="645.0"/> + <omgdi:waypoint x="1080.0" y="645.0"/> + <omgdi:waypoint x="1080.0" y="571.0"/> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1"> + <omgdi:waypoint x="570.0" y="540.0"/> + <omgdi:waypoint x="620.0" y="540.0"/> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge bpmnElement="active2ConfirmPasswordReset" id="BPMNEdge_active2ConfirmPasswordReset"> + <omgdi:waypoint x="1440.0" y="540.0"/> + <omgdi:waypoint x="1785.0" y="540.0"/> + <omgdi:waypoint x="1785.3772727272726" y="664.5"/> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge bpmnElement="flow3" id="BPMNEdge_flow3"> + <omgdi:waypoint x="928.286878319943" y="540.2478767845322"/> + <omgdi:waypoint x="1030.0" y="540.7521232154678"/> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge bpmnElement="sid-CF9ACA40-7750-47C3-A508-7250D24D4F1F" id="BPMNEdge_sid-CF9ACA40-7750-47C3-A508-7250D24D4F1F"> + <omgdi:waypoint x="1515.0" y="790.4389505549949"/> + <omgdi:waypoint x="1080.0" y="790.0"/> + <omgdi:waypoint x="1080.0" y="571.0"/> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge bpmnElement="suspended2Reactivate" id="BPMNEdge_suspended2Reactivate"> + <omgdi:waypoint x="1860.0" y="400.0"/> + <omgdi:waypoint x="1902.0" y="400.0"/> + <omgdi:waypoint x="1902.0" y="320.0"/> + <omgdi:waypoint x="1940.0" y="320.0"/> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge bpmnElement="flow99" id="BPMNEdge_flow99"> + <omgdi:waypoint x="2040.0" y="466.5576923076923"/> + <omgdi:waypoint x="2080.005821071606" y="465.40367823831906"/> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge bpmnElement="flow8" id="BPMNEdge_flow8"> + <omgdi:waypoint x="1130.0" y="540.8529411764706"/> + <omgdi:waypoint x="1400.058651026393" y="540.0586510263929"/> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge bpmnElement="active2Update" id="BPMNEdge_active2Update"> + <omgdi:waypoint x="1420.0" y="560.0"/> + <omgdi:waypoint x="1420.0" y="615.0"/> + </bpmndi:BPMNEdge> + </bpmndi:BPMNPlane> + </bpmndi:BPMNDiagram> +</definitions> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/syncope/blob/702810d8/syncope620/server/workflow-activiti/src/main/resources/workflowActivitiContext.xml ---------------------------------------------------------------------- diff --git a/syncope620/server/workflow-activiti/src/main/resources/workflowActivitiContext.xml b/syncope620/server/workflow-activiti/src/main/resources/workflowActivitiContext.xml new file mode 100644 index 0000000..463c2c7 --- /dev/null +++ b/syncope620/server/workflow-activiti/src/main/resources/workflowActivitiContext.xml @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:context="http://www.springframework.org/schema/context"; + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context.xsd";> + + <bean id="userWorkflowDef" class="org.apache.syncope.server.misc.spring.ResourceWithFallbackLoader"> + <property name="primary" value="file:${conf.directory}/userWorkflow.bpmn20.xml"/> + <property name="fallback" value="classpath:userWorkflow.bpmn20.xml"/> + </bean> + + <bean id="syncopeActivitiUserManager" class="org.apache.syncope.workflow.activiti.SyncopeUserManager"/> + <bean id="syncopeActivitiGroupManager" class="org.apache.syncope.workflow.activiti.SyncopeGroupManager"/> + + <bean id="processEngineConfiguration" class="org.activiti.spring.SpringProcessEngineConfiguration"> + <property name="dataSource" ref="dataSource"/> + <property name="transactionManager" ref="transactionManager"/> + <property name="transactionsExternallyManaged" value="true"/> + <property name="databaseSchemaUpdate" value="true"/> + + <property name="jpaEntityManagerFactory" ref="entityManagerFactory"/> + <property name="jpaHandleTransaction" value="true"/> + <property name="jpaCloseEntityManager" value="false"/> + + <property name="jobExecutorActivate" value="${jobExecutorActivate}"/> + + <property name="customSessionFactories"> + <list> + <bean class="org.apache.syncope.workflow.activiti.SyncopeSessionFactory"> + <property name="syncopeSession" ref="syncopeActivitiUserManager"/> + </bean> + <bean class="org.apache.syncope.workflow.activiti.SyncopeSessionFactory"> + <property name="syncopeSession" ref="syncopeActivitiGroupManager"/> + </bean> + </list> + </property> + <property name="customPreVariableTypes"> + <list> + <bean class="org.apache.syncope.workflow.activiti.SyncopeEntitiesVariableType"/> + </list> + </property> + </bean> + + <bean id="processEngine" class="org.activiti.spring.ProcessEngineFactoryBean"> + <property name="processEngineConfiguration" ref="processEngineConfiguration"/> + </bean> + + <bean id="repositoryService" factory-bean="processEngine" factory-method="getRepositoryService"/> + <bean id="runtimeService" factory-bean="processEngine" factory-method="getRuntimeService"/> + <bean id="taskService" factory-bean="processEngine" factory-method="getTaskService"/> + <bean id="historyService" factory-bean="processEngine" factory-method="getHistoryService"/> + <bean id="managementService" factory-bean="processEngine" factory-method="getManagementService"/> + <bean id="identityService" factory-bean="processEngine" factory-method="getIdentityService"/> + <bean id="formService" factory-bean="processEngine" factory-method="getFormService"/> + + <context:component-scan base-package="org.apache.syncope.workflow.activiti"/> + +</beans> http://git-wip-us.apache.org/repos/asf/syncope/blob/702810d8/syncope620/server/workflow-api/src/main/java/org/apache/syncope/server/workflow/api/UserWorkflowAdapter.java ---------------------------------------------------------------------- diff --git a/syncope620/server/workflow-api/src/main/java/org/apache/syncope/server/workflow/api/UserWorkflowAdapter.java b/syncope620/server/workflow-api/src/main/java/org/apache/syncope/server/workflow/api/UserWorkflowAdapter.java index 1e683d1..c52b4e2 100644 --- a/syncope620/server/workflow-api/src/main/java/org/apache/syncope/server/workflow/api/UserWorkflowAdapter.java +++ b/syncope620/server/workflow-api/src/main/java/org/apache/syncope/server/workflow/api/UserWorkflowAdapter.java @@ -37,8 +37,8 @@ public interface UserWorkflowAdapter extends WorkflowAdapter { * @return user just created * @throws WorkflowException workflow exception */ - WorkflowResult<Map.Entry<Long, Boolean>> create(UserTO userTO, boolean storePassword) throws - WorkflowException; + WorkflowResult<Map.Entry<Long, Boolean>> create(UserTO userTO, boolean storePassword) + throws WorkflowException; /** * Create an user, optionally disabling password policy check. http://git-wip-us.apache.org/repos/asf/syncope/blob/702810d8/syncope620/server/workflow-api/src/main/java/org/apache/syncope/server/workflow/api/WorkflowAdapter.java ---------------------------------------------------------------------- diff --git a/syncope620/server/workflow-api/src/main/java/org/apache/syncope/server/workflow/api/WorkflowAdapter.java b/syncope620/server/workflow-api/src/main/java/org/apache/syncope/server/workflow/api/WorkflowAdapter.java index 82475ef..2c5d880 100644 --- a/syncope620/server/workflow-api/src/main/java/org/apache/syncope/server/workflow/api/WorkflowAdapter.java +++ b/syncope620/server/workflow-api/src/main/java/org/apache/syncope/server/workflow/api/WorkflowAdapter.java @@ -34,7 +34,7 @@ public interface WorkflowAdapter { * @return null if no init is needed or the WorkflowLoader class for handling initialization * @see org.apache.syncope.core.init.SpringContextInitializer */ - Class<? extends WorkflowInstanceLoader> getLoaderClass(); + Class<? extends WorkflowDefinitionLoader> getDefinitionLoaderClass(); /** * Export workflow definition. http://git-wip-us.apache.org/repos/asf/syncope/blob/702810d8/syncope620/server/workflow-api/src/main/java/org/apache/syncope/server/workflow/api/WorkflowDefinitionLoader.java ---------------------------------------------------------------------- diff --git a/syncope620/server/workflow-api/src/main/java/org/apache/syncope/server/workflow/api/WorkflowDefinitionLoader.java b/syncope620/server/workflow-api/src/main/java/org/apache/syncope/server/workflow/api/WorkflowDefinitionLoader.java new file mode 100644 index 0000000..5a3d7f4 --- /dev/null +++ b/syncope620/server/workflow-api/src/main/java/org/apache/syncope/server/workflow/api/WorkflowDefinitionLoader.java @@ -0,0 +1,29 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.syncope.server.workflow.api; + +public interface WorkflowDefinitionLoader { + + void load(); + + void init(); + + String getPrefix(); + +} http://git-wip-us.apache.org/repos/asf/syncope/blob/702810d8/syncope620/server/workflow-api/src/main/java/org/apache/syncope/server/workflow/api/WorkflowInstanceLoader.java ---------------------------------------------------------------------- diff --git a/syncope620/server/workflow-api/src/main/java/org/apache/syncope/server/workflow/api/WorkflowInstanceLoader.java b/syncope620/server/workflow-api/src/main/java/org/apache/syncope/server/workflow/api/WorkflowInstanceLoader.java deleted file mode 100644 index 6271ec6..0000000 --- a/syncope620/server/workflow-api/src/main/java/org/apache/syncope/server/workflow/api/WorkflowInstanceLoader.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.syncope.server.workflow.api; - -public interface WorkflowInstanceLoader { - - void load(); - - String getTablePrefix(); - - void init(); -} http://git-wip-us.apache.org/repos/asf/syncope/blob/702810d8/syncope620/server/workflow-java/src/main/java/org/apache/syncope/server/workflow/java/AbstractRoleWorkflowAdapter.java ---------------------------------------------------------------------- diff --git a/syncope620/server/workflow-java/src/main/java/org/apache/syncope/server/workflow/java/AbstractRoleWorkflowAdapter.java b/syncope620/server/workflow-java/src/main/java/org/apache/syncope/server/workflow/java/AbstractRoleWorkflowAdapter.java index 91502e8..95998e4 100644 --- a/syncope620/server/workflow-java/src/main/java/org/apache/syncope/server/workflow/java/AbstractRoleWorkflowAdapter.java +++ b/syncope620/server/workflow-java/src/main/java/org/apache/syncope/server/workflow/java/AbstractRoleWorkflowAdapter.java @@ -27,7 +27,7 @@ import org.apache.syncope.server.provisioning.api.WorkflowResult; import org.apache.syncope.server.provisioning.api.data.RoleDataBinder; import org.apache.syncope.server.workflow.api.RoleWorkflowAdapter; import org.apache.syncope.server.workflow.api.WorkflowException; -import org.apache.syncope.server.workflow.api.WorkflowInstanceLoader; +import org.apache.syncope.server.workflow.api.WorkflowDefinitionLoader; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @@ -44,7 +44,7 @@ public abstract class AbstractRoleWorkflowAdapter implements RoleWorkflowAdapter protected EntityFactory entityFactory; @Override - public Class<? extends WorkflowInstanceLoader> getLoaderClass() { + public Class<? extends WorkflowDefinitionLoader> getDefinitionLoaderClass() { return null; } http://git-wip-us.apache.org/repos/asf/syncope/blob/702810d8/syncope620/server/workflow-java/src/main/java/org/apache/syncope/server/workflow/java/AbstractUserWorkflowAdapter.java ---------------------------------------------------------------------- diff --git a/syncope620/server/workflow-java/src/main/java/org/apache/syncope/server/workflow/java/AbstractUserWorkflowAdapter.java b/syncope620/server/workflow-java/src/main/java/org/apache/syncope/server/workflow/java/AbstractUserWorkflowAdapter.java index b6adffe..ae13d0b 100644 --- a/syncope620/server/workflow-java/src/main/java/org/apache/syncope/server/workflow/java/AbstractUserWorkflowAdapter.java +++ b/syncope620/server/workflow-java/src/main/java/org/apache/syncope/server/workflow/java/AbstractUserWorkflowAdapter.java @@ -27,7 +27,7 @@ import org.apache.syncope.server.provisioning.api.WorkflowResult; import org.apache.syncope.server.provisioning.api.data.UserDataBinder; import org.apache.syncope.server.workflow.api.UserWorkflowAdapter; import org.apache.syncope.server.workflow.api.WorkflowException; -import org.apache.syncope.server.workflow.api.WorkflowInstanceLoader; +import org.apache.syncope.server.workflow.api.WorkflowDefinitionLoader; import org.identityconnectors.common.Base64; import org.identityconnectors.common.security.EncryptorFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -56,7 +56,7 @@ public abstract class AbstractUserWorkflowAdapter implements UserWorkflowAdapter } @Override - public Class<? extends WorkflowInstanceLoader> getLoaderClass() { + public Class<? extends WorkflowDefinitionLoader> getDefinitionLoaderClass() { return null; }
