diff options
Diffstat (limited to 'id')
22 files changed, 84 insertions, 63 deletions
| diff --git a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml index ce8fe8971..a251064f6 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml @@ -11,7 +11,7 @@  	<bean id="processEngine" class="at.gv.egovernment.moa.id.process.ProcessEngineImpl">
  		<property name="transitionConditionExpressionEvaluator">
 -			<bean class="com.datentechnik.process_engine.spring.SpringExpressionEvaluator" />
 +			<bean class="at.gv.egovernment.moa.id.process.spring.SpringExpressionEvaluator" />
  		</property>
  		<property name="processInstanceMaxIdleTimeSeconds" value="600" />
  	<!--
 diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessDefinitionParser.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessDefinitionParser.java index 6b245f013..162ee624a 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessDefinitionParser.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/ProcessDefinitionParser.java @@ -43,7 +43,7 @@ import at.gv.egovernment.moa.id.process.model.Transition;   */  public class ProcessDefinitionParser { -	private static final String NS = "http://www.datentechnik.com/process-engine/processdefinition/v1"; +	private static final String NS = "http://reference.e-government.gv.at/namespace/moa/process/definition/v1";  	private static Logger log = LoggerFactory.getLogger(ProcessDefinitionParser.class); diff --git a/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/process/ProcessDefinition.xsd b/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/process/ProcessDefinition.xsd index 42db4f807..d6ab7ae46 100644 --- a/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/process/ProcessDefinition.xsd +++ b/id/server/idserverlib/src/main/resources/at/gv/egovernment/moa/id/process/ProcessDefinition.xsd @@ -1,7 +1,7 @@  <?xml version="1.0" encoding="UTF-8"?>  <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" -	targetNamespace="http://www.datentechnik.com/process-engine/processdefinition/v1" -	xmlns:tns="http://www.datentechnik.com/process-engine/processdefinition/v1" +	targetNamespace="http://reference.e-government.gv.at/namespace/moa/process/definition/v1" +	xmlns:tns="http://reference.e-government.gv.at/namespace/moa/process/definition/v1"  	elementFormDefault="qualified" version="1.0">  	<xsd:element name="ProcessDefinition"> diff --git a/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml b/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml index 48c9ee56c..35abc1304 100644 --- a/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml +++ b/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml @@ -1,5 +1,5 @@  <?xml version="1.0" encoding="UTF-8"?>
 -<pd:ProcessDefinition id="DefaultAuthentication" xmlns:pd="http://www.datentechnik.com/process-engine/processdefinition/v1">
 +<pd:ProcessDefinition id="DefaultAuthentication" xmlns:pd="http://reference.e-government.gv.at/namespace/moa/process/definition/v1">
  <!--
  	- National authentication with Austrian Citizen Card and mobile signature.
 diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest.java index 4022a7a15..8752aa7b8 100644 --- a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest.java +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest.java @@ -6,18 +6,22 @@ import static org.junit.Assert.assertEquals;  import static org.junit.Assert.assertNotNull;  import java.io.IOException; +import java.io.InputStream; +import org.junit.BeforeClass;  import org.junit.Test;  import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired;  import org.springframework.test.context.ContextConfiguration;  import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import at.gv.egovernment.moa.id.process.ProcessDefinitionParser;  import at.gv.egovernment.moa.id.process.ProcessDefinitionParserException;  import at.gv.egovernment.moa.id.process.ProcessEngine; +import at.gv.egovernment.moa.id.process.ProcessEngineImpl;  import at.gv.egovernment.moa.id.process.ProcessExecutionException;  import at.gv.egovernment.moa.id.process.ProcessInstance;  import at.gv.egovernment.moa.id.process.api.ExecutionContext; +import at.gv.egovernment.moa.id.process.spring.SpringExpressionEvaluator;  /**   * Tests the process engine using processes based on Spring EL referencing the process context and further Spring beans. @@ -29,12 +33,27 @@ import at.gv.egovernment.moa.id.process.api.ExecutionContext;  @ContextConfiguration  public class SpringExpressionAwareProcessEngineTest { -	@Autowired -	private ProcessEngine pe; +	 +	private static ProcessEngine pe; +	@BeforeClass +	public static void init() throws IOException, ProcessDefinitionParserException { +		 +		pe = new ProcessEngineImpl(); +		((ProcessEngineImpl) pe).setTransitionConditionExpressionEvaluator(new SpringExpressionEvaluator()); +		try (InputStream in = SpringExpressionAwareProcessEngineTest.class.getResourceAsStream("SampleProcessDefinitionWithExpression1.xml")) { +			((ProcessEngineImpl) pe).registerProcessDefinition(in); +		} +		try (InputStream in = SpringExpressionAwareProcessEngineTest.class.getResourceAsStream("SampleProcessDefinitionForSAML1Authentication.xml")) { +			((ProcessEngineImpl) pe).registerProcessDefinition(in); +		} +	} +	  	@Test  	public void testSampleProcessDefinitionWithExpression1() throws IOException, ProcessDefinitionParserException,  			ProcessExecutionException { +		 +		  		ProcessInstance pi = pe.createProcessInstance("SampleProcessWithExpression1");  		assertEquals(NOT_STARTED, pi.getState());  		// start process diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/BooleanStringExpressionEvaluator.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/BooleanStringExpressionEvaluator.java index c51f5fe66..20dfc50ef 100644 --- a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/BooleanStringExpressionEvaluator.java +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/BooleanStringExpressionEvaluator.java @@ -1,4 +1,4 @@ -package at.gv.egovernment.moa.id.process.process_engine.test; +package at.gv.egovernment.moa.id.process.test;  import java.util.Objects; diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/HalloWeltTask.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/HalloWeltTask.java index 1a8de811b..d05200ee8 100644 --- a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/HalloWeltTask.java +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/HalloWeltTask.java @@ -1,4 +1,4 @@ -package at.gv.egovernment.moa.id.process.process_engine.test; +package at.gv.egovernment.moa.id.process.test;  import at.gv.egovernment.moa.id.process.api.ExecutionContext;  import at.gv.egovernment.moa.id.process.api.Task; diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/HelloWorldTask.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/HelloWorldTask.java index 6ce3091dd..e79bb8198 100644 --- a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/HelloWorldTask.java +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/HelloWorldTask.java @@ -1,4 +1,4 @@ -package at.gv.egovernment.moa.id.process.process_engine.test; +package at.gv.egovernment.moa.id.process.test;  import at.gv.egovernment.moa.id.process.api.ExecutionContext;  import at.gv.egovernment.moa.id.process.api.Task; diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/ProcessDefinitionParserTest.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/ProcessDefinitionParserTest.java index e20f4bfe8..df13f064b 100644 --- a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/ProcessDefinitionParserTest.java +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/ProcessDefinitionParserTest.java @@ -1,4 +1,4 @@ -package at.gv.egovernment.moa.id.process.process_engine.test; +package at.gv.egovernment.moa.id.process.test;  import static org.junit.Assert.assertEquals;  import static org.junit.Assert.assertFalse; diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/ProcessEngineTest.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/ProcessEngineTest.java index 04a7a659d..8c718a9e4 100644 --- a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/ProcessEngineTest.java +++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/ProcessEngineTest.java @@ -1,4 +1,4 @@ -package at.gv.egovernment.moa.id.process.process_engine.test; +package at.gv.egovernment.moa.id.process.test;  import static at.gv.egovernment.moa.id.process.ProcessInstanceState.ENDED;  import static at.gv.egovernment.moa.id.process.ProcessInstanceState.NOT_STARTED; diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_NoStartEvents.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_NoStartEvents.xml deleted file mode 100644 index 754b7a34d..000000000 --- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_NoStartEvents.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<tns:ProcessDefinition -	id="SampleProcess1" -	xmlns:tns="http://www.datentechnik.com/process-engine/processdefinition/v1" -	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -	xsi:schemaLocation="http://www.datentechnik.com/process-engine/processdefinition/v1 ../../main/resources/com/datentechnik_innovation/process_engine/ProcessDefinition.xsd "> - -	<tns:Task id="task1" class="com.datentechnik.process_engine.test.HelloWorldTask" /> -	<tns:Task id="task2" async="true" /> - -	<tns:EndEvent id="end" /> - -	<tns:Transition from="task1" to="task2" /> -	<tns:Transition from="task2" to="end" /> -	 -</tns:ProcessDefinition> diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionForSAML1Authentication.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionForSAML1Authentication.xml index 6525fb0cd..764ad6405 100644 --- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionForSAML1Authentication.xml +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionForSAML1Authentication.xml @@ -1,41 +1,41 @@  <?xml version="1.0" encoding="UTF-8"?> -<pd:ProcessDefinition xmlns:pd="http://www.datentechnik.com/process-engine/processdefinition/v1" +<pd:ProcessDefinition xmlns:pd="http://reference.e-government.gv.at/namespace/moa/process/definition/v1"  	id="SampleProcessDefinitionForSAML1Authentication">  	<!--  		returns String 'bkuURL'  	--> -	<pd:Task id="bkuSelectionTask" class="com.datentechnik.process_engine.spring.test.task.SelectBKUTask" /> +	<pd:Task id="bkuSelectionTask" class="at.gv.egovernment.moa.id.process.spring.test.task.SelectBKUTask" />  	<!--  		requires 'bkuURL'  		returns String 'IdentityLink'  	--> -	<pd:Task id="getIdentityLinkTask" class="com.datentechnik.process_engine.spring.test.task.GetIdentityLinkTask" /> +	<pd:Task id="getIdentityLinkTask" class="at.gv.egovernment.moa.id.process.spring.test.task.GetIdentityLinkTask" />  	<!--  		requires 'IdentityLink'  		returns Boolean 'isIdentityLinkValidated'  	--> -	<pd:Task id="validateIdentityLinkTask" class="com.datentechnik.process_engine.spring.test.task.ValidateIdentityLinkTask" /> +	<pd:Task id="validateIdentityLinkTask" class="at.gv.egovernment.moa.id.process.spring.test.task.ValidateIdentityLinkTask" />  	<!--  		requires 'IdentityLink', 'isIdentityLinkValidated', 'bkuURL'  		returns String 'SignedAuthBlock'  	--> -	<pd:Task id="signAuthBlockTask" class="com.datentechnik.process_engine.spring.test.task.SignAuthBlockTask" /> +	<pd:Task id="signAuthBlockTask" class="at.gv.egovernment.moa.id.process.spring.test.task.SignAuthBlockTask" />  	<!--  		requires 'IdentityLink', 'isIdentityLinkValidated', 'SignedAuthBlock'  		returns Boolean 'isSignedAuthBlockValidated'  	--> -	<pd:Task id="validateSignedAuthBlockTask" class="com.datentechnik.process_engine.spring.test.task.ValidateSignedAuthBlockTask" /> +	<pd:Task id="validateSignedAuthBlockTask" class="at.gv.egovernment.moa.id.process.spring.test.task.ValidateSignedAuthBlockTask" />  	<!--  		requires 'IdentityLink', 'isIdentityLinkValidated', 'SignedAuthBlock', 'isSignedAuthBlockValidated';  		returns 'SAML1Assertion'  	--> -	<pd:Task id="createAssertionTask" class="com.datentechnik.process_engine.spring.test.task.CreateSAML1AssertionTask" /> +	<pd:Task id="createAssertionTask" class="at.gv.egovernment.moa.id.process.spring.test.task.CreateSAML1AssertionTask" />  	<pd:StartEvent id="start" />  	<pd:EndEvent id="end" /> diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionWithExpression1.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionWithExpression1.xml index ef71026ec..dfe186423 100644 --- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionWithExpression1.xml +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionWithExpression1.xml @@ -1,5 +1,5 @@  <?xml version="1.0" encoding="UTF-8"?> -<pd:ProcessDefinition xmlns:pd="http://www.datentechnik.com/process-engine/processdefinition/v1" +<pd:ProcessDefinition xmlns:pd="http://reference.e-government.gv.at/namespace/moa/process/definition/v1"  	id="SampleProcessWithExpression1">  	<pd:Task id="task1" /> diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml index eb62d1ae2..1b6b7658e 100644 --- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest-context.xml @@ -5,21 +5,23 @@  	xsi:schemaLocation="http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd  		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> -	<bean id="springElAwareExpressionEvaluator" class="com.datentechnik.process_engine.spring.SpringExpressionEvaluator" /> +	<bean id="springElAwareExpressionEvaluator" class="at.gv.egovernment.moa.id.process.spring.SpringExpressionEvaluator" /> -	<bean id="processEngine" class="com.datentechnik.process_engine.ProcessEngineImpl"> +	<bean id="processEngine" class="at.gv.egovernment.moa.id.process.ProcessEngineImpl">  		<property name="transitionConditionExpressionEvaluator" ref="springElAwareExpressionEvaluator" />  		<property name="processInstanceMaxIdleTimeSeconds" value="600" /> +		<!--    		<property name="processDefinitions">  			<list>  				<bean class="com.datentechnik.process_engine.spring.ProcessDefinitionFactoryBean"> -					<property name="resource" value="classpath:com/datentechnik/process_engine/spring/test/SampleProcessDefinitionWithExpression1.xml" /> +					<property name="resource" value="classpath:at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionWithExpression1.xml" />  				</bean>  				<bean class="com.datentechnik.process_engine.spring.ProcessDefinitionFactoryBean"> -					<property name="resource" value="classpath:com/datentechnik/process_engine/spring/test/SampleProcessDefinitionForSAML1Authentication.xml" /> +					<property name="resource" value="classpath:at/gv/egovernment/moa/id/process/spring/test/SampleProcessDefinitionForSAML1Authentication.xml" />  				</bean>  			</list>  		</property> +		 -->  	</bean>  	<task:scheduler id="taskScheduler" pool-size="1" /> diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest-context.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest-context.xml index dadc6bf81..95b88ca1a 100644 --- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest-context.xml +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/spring/test/SpringExpressionEvaluatorTest-context.xml @@ -3,12 +3,12 @@  	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> -	<bean id="simplePojo" class="com.datentechnik.process_engine.spring.test.SimplePojo"> +	<bean id="simplePojo" class="at.gv.egovernment.moa.id.process.spring.test.SimplePojo">  		<property name="booleanValue" value="true" />  		<property name="integerValue" value="42" />  		<property name="stringValue" value="HelloWorld" />  	</bean> -	<bean id="expressionEvaluator" class="com.datentechnik.process_engine.spring.SpringExpressionEvaluator" /> +	<bean id="expressionEvaluator" class="at.gv.egovernment.moa.id.process.spring.SpringExpressionEvaluator" />  </beans> diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_MultipleStartEvents.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_MultipleStartEvents.xml index 8a32ca46d..17fa17cb4 100644 --- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_MultipleStartEvents.xml +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_MultipleStartEvents.xml @@ -1,14 +1,14 @@  <?xml version="1.0" encoding="UTF-8"?>  <tns:ProcessDefinition  	id="SampleProcess2" -	xmlns:tns="http://www.datentechnik.com/process-engine/processdefinition/v1" +	xmlns:tns="http://reference.e-government.gv.at/namespace/moa/process/definition/v1"  	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -	xsi:schemaLocation="http://www.datentechnik.com/process-engine/processdefinition/v1 ../../main/resources/com/datentechnik_innovation/process_engine/ProcessDefinition.xsd "> +	xsi:schemaLocation="http://reference.e-government.gv.at/namespace/moa/process/definition/v1 ../../main/resources/at/gv/egovernment/moa/id/process/ProcessDefinition.xsd ">  	<tns:StartEvent id="start1" /> -	<tns:Task id="task1" class="com.datentechnik.process_engine.test.HelloWorldTask" /> -	<tns:Task id="task2" async="true" class="com.datentechnik.process_engine.test.HalloWeltTask" /> +	<tns:Task id="task1" class="at.gv.egovernment.moa.id.process.test.HelloWorldTask" /> +	<tns:Task id="task2" async="true" class="at.gv.egovernment.moa.id.process.test.HalloWeltTask" />  	<tns:Task id="task3" />  	<tns:StartEvent id="start2" /> diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_NoStartEvents.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_NoStartEvents.xml new file mode 100644 index 000000000..008309e3a --- /dev/null +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_NoStartEvents.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<tns:ProcessDefinition +	id="SampleProcess1" +	xmlns:tns="http://reference.e-government.gv.at/namespace/moa/process/definition/v1" +	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +	xsi:schemaLocation="http://reference.e-government.gv.at/namespace/moa/process/definition/v1 ../../main/resources/at/gv/egovernment/moa/id/process/ProcessDefinition.xsd "> + +	<tns:Task id="task1" class="at.gv.egovernment.moa.id.process.test.HelloWorldTask" /> +	<tns:Task id="task2" async="true" /> + +	<tns:EndEvent id="end" /> + +	<tns:Transition from="task1" to="task2" /> +	<tns:Transition from="task2" to="end" /> +	 +</tns:ProcessDefinition> diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionLoop.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionLoop.xml index e698f8019..14b281192 100644 --- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionLoop.xml +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionLoop.xml @@ -1,11 +1,11 @@  <?xml version="1.0" encoding="UTF-8"?>  <tns:ProcessDefinition  	id="SampleProcess1" -	xmlns:tns="http://www.datentechnik.com/process-engine/processdefinition/v1" +	xmlns:tns="http://reference.e-government.gv.at/namespace/moa/process/definition/v1"  	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -	xsi:schemaLocation="http://www.datentechnik.com/process-engine/processdefinition/v1 ../../main/resources/com/datentechnik_innovation/process_engine/ProcessDefinition.xsd "> +	xsi:schemaLocation="http://reference.e-government.gv.at/namespace/moa/process/definition/v1 ../../main/resources/at/gv/egovernment/moa/id/process/ProcessDefinition.xsd "> -	<tns:Task id="task1" class="com.datentechnik.process_engine.test.HelloWorldTask" /> +	<tns:Task id="task1" class="at.gv.egovernment.moa.id.process.test.HelloWorldTask" />  	<tns:Task id="task2" async="true" />  	<tns:StartEvent id="start" /> diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionRefsTransition.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionRefsTransition.xml index 564bf9040..1152f3503 100644 --- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionRefsTransition.xml +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionRefsTransition.xml @@ -1,11 +1,11 @@  <?xml version="1.0" encoding="UTF-8"?>  <tns:ProcessDefinition  	id="SampleProcess1" -	xmlns:tns="http://www.datentechnik.com/process-engine/processdefinition/v1" +	xmlns:tns="http://reference.e-government.gv.at/namespace/moa/process/definition/v1"  	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -	xsi:schemaLocation="http://www.datentechnik.com/process-engine/processdefinition/v1 ../../main/resources/com/datentechnik_innovation/process_engine/ProcessDefinition.xsd "> +	xsi:schemaLocation="http://reference.e-government.gv.at/namespace/moa/process/definition/v1 ../../main/resources/at/gv/egovernment/moa/id/process/ProcessDefinition.xsd "> -	<tns:Task id="task1" class="com.datentechnik.process_engine.test.HelloWorldTask" /> +	<tns:Task id="task1" class="at.gv.egovernment.moa.id.process.test.HelloWorldTask" />  	<tns:Task id="task2" async="true" />  	<tns:StartEvent id="start" /> diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml index b3d2d2ebc..94bd25c9a 100644 --- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml @@ -1,11 +1,11 @@  <?xml version="1.0" encoding="UTF-8"?>  <tns:ProcessDefinition  	id="SampleProcess1" -	xmlns:tns="http://www.datentechnik.com/process-engine/processdefinition/v1" +	xmlns:tns="http://reference.e-government.gv.at/namespace/moa/process/definition/v1"  	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -	xsi:schemaLocation="http://www.datentechnik.com/process-engine/processdefinition/v1 ../../main/resources/com/datentechnik_innovation/process_engine/ProcessDefinition.xsd "> +	xsi:schemaLocation="http://reference.e-government.gv.at/namespace/moa/process/definition/v1 ../../main/resources/at/gv/egovernment/moa/id/process/ProcessDefinition.xsd "> -	<tns:Task id="task1" class="com.datentechnik.process_engine.test.HelloWorldTask" /> +	<tns:Task id="task1" class="at.gv.egovernment.moa.id.process.test.HelloWorldTask" />  	<tns:Task id="task2" async="true" />  	<tns:StartEvent id="start" /> diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/SampleProcessDefinition1.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition1.xml index ab033fb8f..c161900c5 100644 --- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/SampleProcessDefinition1.xml +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition1.xml @@ -1,11 +1,11 @@  <?xml version="1.0" encoding="UTF-8"?>  <tns:ProcessDefinition  	id="SampleProcess1" -	xmlns:tns="http://www.datentechnik.com/process-engine/processdefinition/v1" +	xmlns:tns="http://reference.e-government.gv.at/namespace/moa/process/definition/v1"  	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -	xsi:schemaLocation="http://www.datentechnik.com/process-engine/processdefinition/v1 ../../main/resources/com/datentechnik_innovation/process_engine/ProcessDefinition.xsd "> +	xsi:schemaLocation="http://reference.e-government.gv.at/namespace/moa/process/definition/v1 ../../main/resources/at/gv/egovernment/moa/id/process/ProcessDefinition.xsd "> -	<tns:Task id="task1" class="com.datentechnik.process_engine.test.HelloWorldTask" /> +	<tns:Task id="task1" class="at.gv.egovernment.moa.id.process.test.HelloWorldTask" />  	<tns:Task id="task2" async="true" />  	<tns:StartEvent id="start" /> diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/SampleProcessDefinition2.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition2.xml index ca2617ce8..9e419e124 100644 --- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/SampleProcessDefinition2.xml +++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition2.xml @@ -1,14 +1,14 @@  <?xml version="1.0" encoding="UTF-8"?>  <tns:ProcessDefinition  	id="SampleProcess2" -	xmlns:tns="http://www.datentechnik.com/process-engine/processdefinition/v1" +	xmlns:tns="http://reference.e-government.gv.at/namespace/moa/process/definition/v1"  	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -	xsi:schemaLocation="http://www.datentechnik.com/process-engine/processdefinition/v1 ../../main/resources/com/datentechnik_innovation/process_engine/ProcessDefinition.xsd "> +	xsi:schemaLocation="http://reference.e-government.gv.at/namespace/moa/process/definition/v1 ../../main/resources/at/gv/egovernment/moa/id/process/ProcessDefinition.xsd ">  	<tns:StartEvent id="start" /> -	<tns:Task id="task1" class="com.datentechnik.process_engine.test.HelloWorldTask" /> -	<tns:Task id="task2" async="true" class="com.datentechnik.process_engine.test.HalloWeltTask" /> +	<tns:Task id="task1" class="at.gv.egovernment.moa.id.process.test.HelloWorldTask" /> +	<tns:Task id="task2" async="true" class="at.gv.egovernment.moa.id.process.test.HelloWorldTask" />  	<tns:Task id="task3" />  	<tns:EndEvent id="end" /> | 
