From c6f543e06c02c0a2635eac2e9b99c2554e6e27bd Mon Sep 17 00:00:00 2001
From: Christian Wagner <c.wagner@datentechnik-innovation.com>
Date: Thu, 29 Jan 2015 14:39:11 +0100
Subject: integrate process engine from project 'dti-process-engine'

  - fix unit tests
  - correct namespaces
  - refactor package name
---
 .../src/main/webapp/WEB-INF/applicationContext.xml |   2 +-
 .../moa/id/process/ProcessDefinitionParser.java    |   2 +-
 .../moa/id/process/ProcessDefinition.xsd           |   4 +-
 .../processes/DefaultAuthentication.process.xml    |   2 +-
 .../test/BooleanStringExpressionEvaluator.java     |  24 ----
 .../process/process_engine/test/HalloWeltTask.java |  19 ---
 .../process_engine/test/HelloWorldTask.java        |  19 ---
 .../test/ProcessDefinitionParserTest.java          | 137 ---------------------
 .../process_engine/test/ProcessEngineTest.java     |  67 ----------
 .../SpringExpressionAwareProcessEngineTest.java    |  25 +++-
 .../test/BooleanStringExpressionEvaluator.java     |  24 ++++
 .../moa/id/process/test/HalloWeltTask.java         |  19 +++
 .../moa/id/process/test/HelloWorldTask.java        |  19 +++
 .../process/test/ProcessDefinitionParserTest.java  | 137 +++++++++++++++++++++
 .../moa/id/process/test/ProcessEngineTest.java     |  67 ++++++++++
 ...nvalidProcessDefinition_MultipleStartEvents.xml |  22 ----
 .../InvalidProcessDefinition_NoStartEvents.xml     |  16 ---
 .../InvalidProcessDefinition_TransitionLoop.xml    |  21 ----
 ...dProcessDefinition_TransitionRefsTransition.xml |  19 ---
 ...cessDefinition_TransitionStartsFromEndEvent.xml |  19 ---
 .../test/SampleProcessDefinition1.xml              |  18 ---
 .../test/SampleProcessDefinition2.xml              |  21 ----
 ...mpleProcessDefinitionForSAML1Authentication.xml |  14 +--
 .../SampleProcessDefinitionWithExpression1.xml     |   2 +-
 ...ingExpressionAwareProcessEngineTest-context.xml |  10 +-
 .../test/SpringExpressionEvaluatorTest-context.xml |   4 +-
 ...nvalidProcessDefinition_MultipleStartEvents.xml |  22 ++++
 .../InvalidProcessDefinition_NoStartEvents.xml     |  16 +++
 .../InvalidProcessDefinition_TransitionLoop.xml    |  21 ++++
 ...dProcessDefinition_TransitionRefsTransition.xml |  19 +++
 ...cessDefinition_TransitionStartsFromEndEvent.xml |  19 +++
 .../id/process/test/SampleProcessDefinition1.xml   |  18 +++
 .../id/process/test/SampleProcessDefinition2.xml   |  21 ++++
 33 files changed, 445 insertions(+), 424 deletions(-)
 delete mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/BooleanStringExpressionEvaluator.java
 delete mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/HalloWeltTask.java
 delete mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/HelloWorldTask.java
 delete mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/ProcessDefinitionParserTest.java
 delete mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/ProcessEngineTest.java
 create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/BooleanStringExpressionEvaluator.java
 create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/HalloWeltTask.java
 create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/HelloWorldTask.java
 create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/ProcessDefinitionParserTest.java
 create mode 100644 id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/ProcessEngineTest.java
 delete mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_MultipleStartEvents.xml
 delete mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_NoStartEvents.xml
 delete mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionLoop.xml
 delete mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionRefsTransition.xml
 delete mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml
 delete mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/SampleProcessDefinition1.xml
 delete mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/SampleProcessDefinition2.xml
 create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_MultipleStartEvents.xml
 create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_NoStartEvents.xml
 create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionLoop.xml
 create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionRefsTransition.xml
 create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml
 create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition1.xml
 create mode 100644 id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition2.xml

(limited to 'id')

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/process_engine/test/BooleanStringExpressionEvaluator.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/BooleanStringExpressionEvaluator.java
deleted file mode 100644
index c51f5fe66..000000000
--- a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/BooleanStringExpressionEvaluator.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package at.gv.egovernment.moa.id.process.process_engine.test;
-
-import java.util.Objects;
-
-import org.apache.commons.lang3.BooleanUtils;
-
-import at.gv.egovernment.moa.id.process.api.ExpressionEvaluationContext;
-import at.gv.egovernment.moa.id.process.api.ExpressionEvaluator;
-
-/**
- * Expression evaluator that guesses the boolean value from a String. Refer to {@link BooleanUtils#toBoolean(String)}
- * for further information.
- * 
- * @author tknall
- * 
- */
-public class BooleanStringExpressionEvaluator implements ExpressionEvaluator {
-
-	@Override
-	public boolean evaluate(ExpressionEvaluationContext expressionContext, String expression) {
-		return BooleanUtils.toBoolean(Objects.requireNonNull(expression, "Expression must not be null."));
-	}
-
-}
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/process_engine/test/HalloWeltTask.java
deleted file mode 100644
index 1a8de811b..000000000
--- a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/HalloWeltTask.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package at.gv.egovernment.moa.id.process.process_engine.test;
-
-import at.gv.egovernment.moa.id.process.api.ExecutionContext;
-import at.gv.egovernment.moa.id.process.api.Task;
-
-/**
- * Simple task that just outputs a "Hallo World" text to the console.
- * 
- * @author tknall
- * 
- */
-public class HalloWeltTask implements Task {
-
-	@Override
-	public void execute(ExecutionContext executionContext) {
-		System.out.println("Hallo Welt");
-	}
-
-}
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/process_engine/test/HelloWorldTask.java
deleted file mode 100644
index 6ce3091dd..000000000
--- a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/HelloWorldTask.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package at.gv.egovernment.moa.id.process.process_engine.test;
-
-import at.gv.egovernment.moa.id.process.api.ExecutionContext;
-import at.gv.egovernment.moa.id.process.api.Task;
-
-/**
- * Simple task that just outputs a "Hello World" text to the console.
- * 
- * @author tknall
- * 
- */
-public class HelloWorldTask implements Task {
-
-	@Override
-	public void execute(ExecutionContext executionContext) {
-		System.out.println("Hello World");
-	}
-
-}
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/process_engine/test/ProcessDefinitionParserTest.java
deleted file mode 100644
index e20f4bfe8..000000000
--- a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/ProcessDefinitionParserTest.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package at.gv.egovernment.moa.id.process.process_engine.test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.junit.Test;
-
-import at.gv.egovernment.moa.id.process.ProcessDefinitionParser;
-import at.gv.egovernment.moa.id.process.ProcessDefinitionParserException;
-import at.gv.egovernment.moa.id.process.model.EndEvent;
-import at.gv.egovernment.moa.id.process.model.ProcessDefinition;
-import at.gv.egovernment.moa.id.process.model.ProcessNode;
-import at.gv.egovernment.moa.id.process.model.StartEvent;
-import at.gv.egovernment.moa.id.process.model.TaskInfo;
-import at.gv.egovernment.moa.id.process.model.Transition;
-
-public class ProcessDefinitionParserTest {
-	
-	@Test(expected = ProcessDefinitionParserException.class)
-	public void testParseInvalidProcessDefinition_MultipleStartEvents() throws IOException, ProcessDefinitionParserException {
-		try (InputStream in = getClass().getResourceAsStream("InvalidProcessDefinition_MultipleStartEvents.xml")) {
-			new ProcessDefinitionParser().parse(in);
-		}
-	}
-	
-	@Test(expected = ProcessDefinitionParserException.class)
-	public void testParseInvalidProcessDefinition_TransitionLoop() throws IOException, ProcessDefinitionParserException {
-		try (InputStream in = getClass().getResourceAsStream("InvalidProcessDefinition_TransitionLoop.xml")) {
-			new ProcessDefinitionParser().parse(in);
-		}
-	}
-	
-	@Test(expected = ProcessDefinitionParserException.class)
-	public void testParseInvalidProcessDefinition_TransitionStartsFromEndEvent() throws IOException, ProcessDefinitionParserException {
-		try (InputStream in = getClass().getResourceAsStream("InvalidProcessDefinition_TransitionStartsFromEndEvent.xml")) {
-			new ProcessDefinitionParser().parse(in);
-		}
-	}
-	
-	@Test(expected = ProcessDefinitionParserException.class)
-	public void testParseInvalidProcessDefinition_TransitionRefsTransition() throws IOException, ProcessDefinitionParserException {
-		try (InputStream in = getClass().getResourceAsStream("InvalidProcessDefinition_TransitionRefsTransition.xml")) {
-			new ProcessDefinitionParser().parse(in);
-		}
-	}
-	
-	@Test(expected = ProcessDefinitionParserException.class)
-	public void testParseInvalidProcessDefinition_NoStartEvents() throws IOException, ProcessDefinitionParserException {
-		try (InputStream in = getClass().getResourceAsStream("InvalidProcessDefinition_NoStartEvents.xml")) {
-			new ProcessDefinitionParser().parse(in);
-		}
-	}
-	
-	@Test
-	public void testParseSampleProcessDefinition() throws IOException, ProcessDefinitionParserException {
-		try (InputStream in = getClass().getResourceAsStream("SampleProcessDefinition1.xml")) {
-			
-			ProcessDefinitionParser parser = new ProcessDefinitionParser();
-			ProcessDefinition pd = parser.parse(in);
-			
-			assertNotNull(pd);
-			assertEquals("SampleProcess1", pd.getId());
-			
-			// first assert tasks then transitions
-			// start event
-			StartEvent startEvent = pd.getStartEvent();
-			assertNotNull(startEvent);
-			assertEquals("start", startEvent.getId());
-			assertEquals(startEvent, pd.getProcessNode("start"));
-			// task1
-			ProcessNode processNode = pd.getProcessNode("task1");
-			assertNotNull(processNode);
-			assertTrue(processNode instanceof TaskInfo);
-			TaskInfo task1 = (TaskInfo) processNode;
-			assertEquals("task1", task1.getId());
-			assertFalse(task1.isAsync());
-			// task2 
-			processNode = pd.getProcessNode("task2");
-			assertNotNull(processNode);
-			assertTrue(processNode instanceof TaskInfo);
-			TaskInfo task2 = (TaskInfo) processNode;
-			assertEquals("task2", task2.getId());
-			assertTrue(task2.isAsync());
-			// end event
-			processNode = pd.getProcessNode("end");
-			assertNotNull(processNode);
-			assertTrue(processNode instanceof EndEvent);
-			EndEvent endEvent = (EndEvent) processNode;
-			assertEquals("end", endEvent.getId());
-			
-			// assert transitions
-			// start event
-			assertNotNull(startEvent.getIncomingTransitions());
-			assertTrue(startEvent.getIncomingTransitions().isEmpty());
-			assertNotNull(startEvent.getOutgoingTransitions());
-			assertEquals(1, startEvent.getOutgoingTransitions().size());
-			// transition from start to task1
-			Transition startToTask1 = startEvent.getOutgoingTransitions().get(0);
-			assertEquals("fromStart", startToTask1.getId());
-			assertEquals(startEvent, startToTask1.getFrom());
-			assertEquals(task1, startToTask1.getTo());
-			assertEquals("true", startToTask1.getConditionExpression());
-			// task1
-			assertNotNull(task1.getIncomingTransitions());
-			assertEquals(1, task1.getIncomingTransitions().size());
-			assertEquals(startToTask1, task1.getIncomingTransitions().get(0));
-			assertNotNull(task1.getOutgoingTransitions());
-			assertEquals(1, task1.getOutgoingTransitions().size());
-			// transition from task1 to task2
-			Transition task1ToTask2 = task1.getOutgoingTransitions().get(0);
-			assertNull(task1ToTask2.getId());
-			assertEquals(task1, task1ToTask2.getFrom());
-			assertEquals(task2, task1ToTask2.getTo());
-			assertNull(task1ToTask2.getConditionExpression());
-			// task2
-			assertNotNull(task2.getIncomingTransitions());
-			assertEquals(1, task2.getIncomingTransitions().size());
-			assertEquals(task1ToTask2, task2.getIncomingTransitions().get(0));
-			assertNotNull(task2.getOutgoingTransitions());
-			assertEquals(1, task2.getOutgoingTransitions().size());
-			// transition from task2 to end
-			Transition task2ToEnd = task2.getOutgoingTransitions().get(0);
-			assertNull(task2ToEnd.getId());
-			assertEquals(task2, task2ToEnd.getFrom());
-			assertEquals(endEvent, task2ToEnd.getTo());
-			assertNull(task2ToEnd.getConditionExpression());
-			
-		}
-	}
-
-}
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/process_engine/test/ProcessEngineTest.java
deleted file mode 100644
index 04a7a659d..000000000
--- a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/process_engine/test/ProcessEngineTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package at.gv.egovernment.moa.id.process.process_engine.test;
-
-import static at.gv.egovernment.moa.id.process.ProcessInstanceState.ENDED;
-import static at.gv.egovernment.moa.id.process.ProcessInstanceState.NOT_STARTED;
-import static at.gv.egovernment.moa.id.process.ProcessInstanceState.SUSPENDED;
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-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;
-
-public class ProcessEngineTest {
-	
-	private static ProcessEngine pe;
-	
-	@BeforeClass
-	public static void init() throws IOException, ProcessDefinitionParserException {
-		ProcessDefinitionParser pdp = new ProcessDefinitionParser();
-		pe = new ProcessEngineImpl();
-		((ProcessEngineImpl) pe).setTransitionConditionExpressionEvaluator(new BooleanStringExpressionEvaluator());
-		try (InputStream in = ProcessEngineTest.class.getResourceAsStream("SampleProcessDefinition1.xml")) {
-			((ProcessEngineImpl) pe).registerProcessDefinition(pdp.parse(in));
-		}
-		try (InputStream in = ProcessEngineTest.class.getResourceAsStream("SampleProcessDefinition2.xml")) {
-			((ProcessEngineImpl) pe).registerProcessDefinition(pdp.parse(in));
-		}
-	}
-	
-	@Test
-	public void testSampleProcess1() throws IOException, ProcessDefinitionParserException, ProcessExecutionException {
-		ProcessInstance pi = pe.createProcessInstance("SampleProcess1");
-		assertEquals(NOT_STARTED, pi.getState());
-		// start process
-		pe.start(pi);
-		assertEquals(SUSPENDED, pi.getState());
-		System.out.println("Do something asynchronously");
-		pe.signal(pi);
-		assertEquals(ENDED, pi.getState());
-	}
-	
-	@Test
-	public void testSampleProcess2() throws IOException, ProcessDefinitionParserException, ProcessExecutionException {
-		ProcessInstance pi = pe.createProcessInstance("SampleProcess2");
-		assertEquals(NOT_STARTED, pi.getState());
-		// start process
-		pe.start(pi);
-		assertEquals(SUSPENDED, pi.getState());
-		System.out.println("Do something asynchronously");
-		pe.signal(pi);
-		assertEquals(ENDED, pi.getState());
-	}
-	
-	@Test(expected = IllegalArgumentException.class)
-	public void testProcessInstanceDoesNotExist() {
-		pe.getProcessInstance("does not exist");
-	}
-
-}
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/test/BooleanStringExpressionEvaluator.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/BooleanStringExpressionEvaluator.java
new file mode 100644
index 000000000..20dfc50ef
--- /dev/null
+++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/BooleanStringExpressionEvaluator.java
@@ -0,0 +1,24 @@
+package at.gv.egovernment.moa.id.process.test;
+
+import java.util.Objects;
+
+import org.apache.commons.lang3.BooleanUtils;
+
+import at.gv.egovernment.moa.id.process.api.ExpressionEvaluationContext;
+import at.gv.egovernment.moa.id.process.api.ExpressionEvaluator;
+
+/**
+ * Expression evaluator that guesses the boolean value from a String. Refer to {@link BooleanUtils#toBoolean(String)}
+ * for further information.
+ * 
+ * @author tknall
+ * 
+ */
+public class BooleanStringExpressionEvaluator implements ExpressionEvaluator {
+
+	@Override
+	public boolean evaluate(ExpressionEvaluationContext expressionContext, String expression) {
+		return BooleanUtils.toBoolean(Objects.requireNonNull(expression, "Expression must not be null."));
+	}
+
+}
diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/HalloWeltTask.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/HalloWeltTask.java
new file mode 100644
index 000000000..d05200ee8
--- /dev/null
+++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/HalloWeltTask.java
@@ -0,0 +1,19 @@
+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;
+
+/**
+ * Simple task that just outputs a "Hallo World" text to the console.
+ * 
+ * @author tknall
+ * 
+ */
+public class HalloWeltTask implements Task {
+
+	@Override
+	public void execute(ExecutionContext executionContext) {
+		System.out.println("Hallo Welt");
+	}
+
+}
diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/HelloWorldTask.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/HelloWorldTask.java
new file mode 100644
index 000000000..e79bb8198
--- /dev/null
+++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/HelloWorldTask.java
@@ -0,0 +1,19 @@
+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;
+
+/**
+ * Simple task that just outputs a "Hello World" text to the console.
+ * 
+ * @author tknall
+ * 
+ */
+public class HelloWorldTask implements Task {
+
+	@Override
+	public void execute(ExecutionContext executionContext) {
+		System.out.println("Hello World");
+	}
+
+}
diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/ProcessDefinitionParserTest.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/ProcessDefinitionParserTest.java
new file mode 100644
index 000000000..df13f064b
--- /dev/null
+++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/ProcessDefinitionParserTest.java
@@ -0,0 +1,137 @@
+package at.gv.egovernment.moa.id.process.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.junit.Test;
+
+import at.gv.egovernment.moa.id.process.ProcessDefinitionParser;
+import at.gv.egovernment.moa.id.process.ProcessDefinitionParserException;
+import at.gv.egovernment.moa.id.process.model.EndEvent;
+import at.gv.egovernment.moa.id.process.model.ProcessDefinition;
+import at.gv.egovernment.moa.id.process.model.ProcessNode;
+import at.gv.egovernment.moa.id.process.model.StartEvent;
+import at.gv.egovernment.moa.id.process.model.TaskInfo;
+import at.gv.egovernment.moa.id.process.model.Transition;
+
+public class ProcessDefinitionParserTest {
+	
+	@Test(expected = ProcessDefinitionParserException.class)
+	public void testParseInvalidProcessDefinition_MultipleStartEvents() throws IOException, ProcessDefinitionParserException {
+		try (InputStream in = getClass().getResourceAsStream("InvalidProcessDefinition_MultipleStartEvents.xml")) {
+			new ProcessDefinitionParser().parse(in);
+		}
+	}
+	
+	@Test(expected = ProcessDefinitionParserException.class)
+	public void testParseInvalidProcessDefinition_TransitionLoop() throws IOException, ProcessDefinitionParserException {
+		try (InputStream in = getClass().getResourceAsStream("InvalidProcessDefinition_TransitionLoop.xml")) {
+			new ProcessDefinitionParser().parse(in);
+		}
+	}
+	
+	@Test(expected = ProcessDefinitionParserException.class)
+	public void testParseInvalidProcessDefinition_TransitionStartsFromEndEvent() throws IOException, ProcessDefinitionParserException {
+		try (InputStream in = getClass().getResourceAsStream("InvalidProcessDefinition_TransitionStartsFromEndEvent.xml")) {
+			new ProcessDefinitionParser().parse(in);
+		}
+	}
+	
+	@Test(expected = ProcessDefinitionParserException.class)
+	public void testParseInvalidProcessDefinition_TransitionRefsTransition() throws IOException, ProcessDefinitionParserException {
+		try (InputStream in = getClass().getResourceAsStream("InvalidProcessDefinition_TransitionRefsTransition.xml")) {
+			new ProcessDefinitionParser().parse(in);
+		}
+	}
+	
+	@Test(expected = ProcessDefinitionParserException.class)
+	public void testParseInvalidProcessDefinition_NoStartEvents() throws IOException, ProcessDefinitionParserException {
+		try (InputStream in = getClass().getResourceAsStream("InvalidProcessDefinition_NoStartEvents.xml")) {
+			new ProcessDefinitionParser().parse(in);
+		}
+	}
+	
+	@Test
+	public void testParseSampleProcessDefinition() throws IOException, ProcessDefinitionParserException {
+		try (InputStream in = getClass().getResourceAsStream("SampleProcessDefinition1.xml")) {
+			
+			ProcessDefinitionParser parser = new ProcessDefinitionParser();
+			ProcessDefinition pd = parser.parse(in);
+			
+			assertNotNull(pd);
+			assertEquals("SampleProcess1", pd.getId());
+			
+			// first assert tasks then transitions
+			// start event
+			StartEvent startEvent = pd.getStartEvent();
+			assertNotNull(startEvent);
+			assertEquals("start", startEvent.getId());
+			assertEquals(startEvent, pd.getProcessNode("start"));
+			// task1
+			ProcessNode processNode = pd.getProcessNode("task1");
+			assertNotNull(processNode);
+			assertTrue(processNode instanceof TaskInfo);
+			TaskInfo task1 = (TaskInfo) processNode;
+			assertEquals("task1", task1.getId());
+			assertFalse(task1.isAsync());
+			// task2 
+			processNode = pd.getProcessNode("task2");
+			assertNotNull(processNode);
+			assertTrue(processNode instanceof TaskInfo);
+			TaskInfo task2 = (TaskInfo) processNode;
+			assertEquals("task2", task2.getId());
+			assertTrue(task2.isAsync());
+			// end event
+			processNode = pd.getProcessNode("end");
+			assertNotNull(processNode);
+			assertTrue(processNode instanceof EndEvent);
+			EndEvent endEvent = (EndEvent) processNode;
+			assertEquals("end", endEvent.getId());
+			
+			// assert transitions
+			// start event
+			assertNotNull(startEvent.getIncomingTransitions());
+			assertTrue(startEvent.getIncomingTransitions().isEmpty());
+			assertNotNull(startEvent.getOutgoingTransitions());
+			assertEquals(1, startEvent.getOutgoingTransitions().size());
+			// transition from start to task1
+			Transition startToTask1 = startEvent.getOutgoingTransitions().get(0);
+			assertEquals("fromStart", startToTask1.getId());
+			assertEquals(startEvent, startToTask1.getFrom());
+			assertEquals(task1, startToTask1.getTo());
+			assertEquals("true", startToTask1.getConditionExpression());
+			// task1
+			assertNotNull(task1.getIncomingTransitions());
+			assertEquals(1, task1.getIncomingTransitions().size());
+			assertEquals(startToTask1, task1.getIncomingTransitions().get(0));
+			assertNotNull(task1.getOutgoingTransitions());
+			assertEquals(1, task1.getOutgoingTransitions().size());
+			// transition from task1 to task2
+			Transition task1ToTask2 = task1.getOutgoingTransitions().get(0);
+			assertNull(task1ToTask2.getId());
+			assertEquals(task1, task1ToTask2.getFrom());
+			assertEquals(task2, task1ToTask2.getTo());
+			assertNull(task1ToTask2.getConditionExpression());
+			// task2
+			assertNotNull(task2.getIncomingTransitions());
+			assertEquals(1, task2.getIncomingTransitions().size());
+			assertEquals(task1ToTask2, task2.getIncomingTransitions().get(0));
+			assertNotNull(task2.getOutgoingTransitions());
+			assertEquals(1, task2.getOutgoingTransitions().size());
+			// transition from task2 to end
+			Transition task2ToEnd = task2.getOutgoingTransitions().get(0);
+			assertNull(task2ToEnd.getId());
+			assertEquals(task2, task2ToEnd.getFrom());
+			assertEquals(endEvent, task2ToEnd.getTo());
+			assertNull(task2ToEnd.getConditionExpression());
+			
+		}
+	}
+
+}
diff --git a/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/ProcessEngineTest.java b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/ProcessEngineTest.java
new file mode 100644
index 000000000..8c718a9e4
--- /dev/null
+++ b/id/server/idserverlib/src/test/java/at/gv/egovernment/moa/id/process/test/ProcessEngineTest.java
@@ -0,0 +1,67 @@
+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;
+import static at.gv.egovernment.moa.id.process.ProcessInstanceState.SUSPENDED;
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+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;
+
+public class ProcessEngineTest {
+	
+	private static ProcessEngine pe;
+	
+	@BeforeClass
+	public static void init() throws IOException, ProcessDefinitionParserException {
+		ProcessDefinitionParser pdp = new ProcessDefinitionParser();
+		pe = new ProcessEngineImpl();
+		((ProcessEngineImpl) pe).setTransitionConditionExpressionEvaluator(new BooleanStringExpressionEvaluator());
+		try (InputStream in = ProcessEngineTest.class.getResourceAsStream("SampleProcessDefinition1.xml")) {
+			((ProcessEngineImpl) pe).registerProcessDefinition(pdp.parse(in));
+		}
+		try (InputStream in = ProcessEngineTest.class.getResourceAsStream("SampleProcessDefinition2.xml")) {
+			((ProcessEngineImpl) pe).registerProcessDefinition(pdp.parse(in));
+		}
+	}
+	
+	@Test
+	public void testSampleProcess1() throws IOException, ProcessDefinitionParserException, ProcessExecutionException {
+		ProcessInstance pi = pe.createProcessInstance("SampleProcess1");
+		assertEquals(NOT_STARTED, pi.getState());
+		// start process
+		pe.start(pi);
+		assertEquals(SUSPENDED, pi.getState());
+		System.out.println("Do something asynchronously");
+		pe.signal(pi);
+		assertEquals(ENDED, pi.getState());
+	}
+	
+	@Test
+	public void testSampleProcess2() throws IOException, ProcessDefinitionParserException, ProcessExecutionException {
+		ProcessInstance pi = pe.createProcessInstance("SampleProcess2");
+		assertEquals(NOT_STARTED, pi.getState());
+		// start process
+		pe.start(pi);
+		assertEquals(SUSPENDED, pi.getState());
+		System.out.println("Do something asynchronously");
+		pe.signal(pi);
+		assertEquals(ENDED, pi.getState());
+	}
+	
+	@Test(expected = IllegalArgumentException.class)
+	public void testProcessInstanceDoesNotExist() {
+		pe.getProcessInstance("does not exist");
+	}
+
+}
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/process_engine/test/InvalidProcessDefinition_MultipleStartEvents.xml
deleted file mode 100644
index 8a32ca46d..000000000
--- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_MultipleStartEvents.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:ProcessDefinition
-	id="SampleProcess2"
-	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: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="task3" />
-
-	<tns:StartEvent id="start2" />
-	<tns:EndEvent id="end" />
-
-	<tns:Transition id="fromStart" from="start1" to="task1" conditionExpression="true" />
-	<tns:Transition from="task1" to="task2" />
-	<tns:Transition from="task2" to="task3" />
-	<tns:Transition from="task3" to="end" />
-	
-</tns:ProcessDefinition>
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/process_engine/test/InvalidProcessDefinition_TransitionLoop.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionLoop.xml
deleted file mode 100644
index e698f8019..000000000
--- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionLoop.xml
+++ /dev/null
@@ -1,21 +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:StartEvent id="start" />
-	<tns:EndEvent id="end" />
-
-	<tns:Transition id="fromStart" from="start" to="task1" conditionExpression="true" />
-	<tns:Transition from="task1" to="task2" />
-	<tns:Transition from="task2" to="end" />
-
-	<!-- Must be loop since we have no conditionExpression set. -->
-	<tns:Transition id="loop" from="task1" to="task1" />
-	
-</tns:ProcessDefinition>
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/process_engine/test/InvalidProcessDefinition_TransitionRefsTransition.xml
deleted file mode 100644
index 564bf9040..000000000
--- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionRefsTransition.xml
+++ /dev/null
@@ -1,19 +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:StartEvent id="start" />
-	<tns:EndEvent id="end" />
-
-	<tns:Transition id="fromStart" from="start" to="task1" conditionExpression="true" />
-	<tns:Transition from="task1" to="task2" />
-	<tns:Transition id="invalidTransition" from="task1" to="fromStart" />
-	<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_TransitionStartsFromEndEvent.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml
deleted file mode 100644
index b3d2d2ebc..000000000
--- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml
+++ /dev/null
@@ -1,19 +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:StartEvent id="start" />
-	<tns:EndEvent id="end" />
-
-	<tns:Transition id="fromStart" from="start" to="task1" conditionExpression="true" />
-	<tns:Transition from="task1" to="task2" />
-	<tns:Transition from="task2" to="end" />
-	<tns:Transition from="end" to="task1" />
-	
-</tns:ProcessDefinition>
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/process_engine/test/SampleProcessDefinition1.xml
deleted file mode 100644
index ab033fb8f..000000000
--- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/SampleProcessDefinition1.xml
+++ /dev/null
@@ -1,18 +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:StartEvent id="start" />
-	<tns:EndEvent id="end" />
-
-	<tns:Transition id="fromStart" from="start" to="task1" conditionExpression="true" />
-	<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/SampleProcessDefinition2.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/SampleProcessDefinition2.xml
deleted file mode 100644
index ca2617ce8..000000000
--- a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/process_engine/test/SampleProcessDefinition2.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:ProcessDefinition
-	id="SampleProcess2"
-	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: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="task3" />
-
-	<tns:EndEvent id="end" />
-
-	<tns:Transition id="fromStart" from="start" to="task1" conditionExpression="true" />
-	<tns:Transition from="task1" to="task2" />
-	<tns:Transition from="task2" to="task3" />
-	<tns:Transition from="task3" 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/test/InvalidProcessDefinition_MultipleStartEvents.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_MultipleStartEvents.xml
new file mode 100644
index 000000000..17fa17cb4
--- /dev/null
+++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_MultipleStartEvents.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:ProcessDefinition
+	id="SampleProcess2"
+	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:StartEvent id="start1" />
+
+	<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" />
+	<tns:EndEvent id="end" />
+
+	<tns:Transition id="fromStart" from="start1" to="task1" conditionExpression="true" />
+	<tns:Transition from="task1" to="task2" />
+	<tns:Transition from="task2" to="task3" />
+	<tns:Transition from="task3" to="end" />
+	
+</tns:ProcessDefinition>
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/test/InvalidProcessDefinition_TransitionLoop.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionLoop.xml
new file mode 100644
index 000000000..14b281192
--- /dev/null
+++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionLoop.xml
@@ -0,0 +1,21 @@
+<?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:StartEvent id="start" />
+	<tns:EndEvent id="end" />
+
+	<tns:Transition id="fromStart" from="start" to="task1" conditionExpression="true" />
+	<tns:Transition from="task1" to="task2" />
+	<tns:Transition from="task2" to="end" />
+
+	<!-- Must be loop since we have no conditionExpression set. -->
+	<tns:Transition id="loop" from="task1" to="task1" />
+	
+</tns:ProcessDefinition>
diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionRefsTransition.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionRefsTransition.xml
new file mode 100644
index 000000000..1152f3503
--- /dev/null
+++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionRefsTransition.xml
@@ -0,0 +1,19 @@
+<?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:StartEvent id="start" />
+	<tns:EndEvent id="end" />
+
+	<tns:Transition id="fromStart" from="start" to="task1" conditionExpression="true" />
+	<tns:Transition from="task1" to="task2" />
+	<tns:Transition id="invalidTransition" from="task1" to="fromStart" />
+	<tns:Transition from="task2" to="end" />
+	
+</tns:ProcessDefinition>
diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml
new file mode 100644
index 000000000..94bd25c9a
--- /dev/null
+++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/InvalidProcessDefinition_TransitionStartsFromEndEvent.xml
@@ -0,0 +1,19 @@
+<?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:StartEvent id="start" />
+	<tns:EndEvent id="end" />
+
+	<tns:Transition id="fromStart" from="start" to="task1" conditionExpression="true" />
+	<tns:Transition from="task1" to="task2" />
+	<tns:Transition from="task2" to="end" />
+	<tns:Transition from="end" to="task1" />
+	
+</tns:ProcessDefinition>
diff --git a/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition1.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition1.xml
new file mode 100644
index 000000000..c161900c5
--- /dev/null
+++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition1.xml
@@ -0,0 +1,18 @@
+<?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:StartEvent id="start" />
+	<tns:EndEvent id="end" />
+
+	<tns:Transition id="fromStart" from="start" to="task1" conditionExpression="true" />
+	<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/test/SampleProcessDefinition2.xml b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition2.xml
new file mode 100644
index 000000000..9e419e124
--- /dev/null
+++ b/id/server/idserverlib/src/test/resources/at/gv/egovernment/moa/id/process/test/SampleProcessDefinition2.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:ProcessDefinition
+	id="SampleProcess2"
+	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:StartEvent id="start" />
+
+	<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" />
+
+	<tns:Transition id="fromStart" from="start" to="task1" conditionExpression="true" />
+	<tns:Transition from="task1" to="task2" />
+	<tns:Transition from="task2" to="task3" />
+	<tns:Transition from="task3" to="end" />
+	
+</tns:ProcessDefinition>
-- 
cgit v1.2.3