Add dti-process-engine support.

6 files changed, 77 insertions, 1 deletions

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 7db6ce648..529737820 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -189,6 +189,16 @@
 		</dependency>
 
 		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
 			<version>1.7.10</version>
diff --git a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
new file mode 100644
index 000000000..b340133c7
--- /dev/null
+++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<beans xmlns="http://www.springframework.org/schema/beans"

+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+	xmlns:context="http://www.springframework.org/schema/context"

+	xmlns:task="http://www.springframework.org/schema/task"

+	xsi:schemaLocation="http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.1.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">

+

+	<context:annotation-config />

+

+	<bean id="processEngine" class="com.datentechnik.process_engine.ProcessEngineImpl">

+		<property name="transitionConditionExpressionEvaluator">

+			<bean class="com.datentechnik.process_engine.spring.SpringExpressionEvaluator" />

+		</property>

+		<property name="processInstanceMaxIdleTimeSeconds" value="600" />

+		<property name="processDefinitions">

+			<bean class="com.datentechnik.process_engine.spring.ProcessDefinitionsFactoryBean">

+				<property name="resources" value="classpath:resources/processes/*.process.xml" />

+			</bean>

+		</property>

+	</bean>

+	

+	<task:scheduler id="taskScheduler" pool-size="1" />

+	<task:scheduled-tasks scheduler="taskScheduler">

+		<task:scheduled ref="processEngine" method="cleanup" fixed-delay="60000" />

+	</task:scheduled-tasks>

+

+</beans>

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index fc48d87ac..ba06ce142 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -15,6 +15,7 @@
 

 	<properties>

 		<repositoryPath>${basedir}/../../../repository</repositoryPath>

+		<com.datentechnik.process-engine.version>0.0.1-SNAPSHOT</com.datentechnik.process-engine.version>

 	</properties>

 

 	<repositories>

@@ -147,11 +148,13 @@
 			<groupId>javax.mail</groupId>

 			<artifactId>mail</artifactId>

 		</dependency>

+		<!--

 		<dependency>

 			<groupId>javax.servlet</groupId>

 			<artifactId>servlet-api</artifactId>

 			<scope>provided</scope>

 		</dependency>

+		-->

 		

         <dependency>

             <groupId>xalan-bin-dist</groupId>

@@ -396,6 +399,13 @@
 				</exclusion>

 			</exclusions>

 		</dependency>

+

+		<dependency>

+			<groupId>com.datentechnik.process-engine</groupId>

+			<artifactId>dti-process-engine-spring-web</artifactId>

+			<version>${com.datentechnik.process-engine.version}</version>

+		</dependency>

+

 	</dependencies>

 

 	<build>

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java
index e5b2c598c..eb480e37c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java
@@ -67,6 +67,8 @@ import org.apache.commons.fileupload.FileUploadException;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
 
+import com.datentechnik.process_engine.springweb.AbstractAuthSourceServlet;
+
 import at.gv.egovernment.moa.id.advancedlogging.StatisticLogger;
 import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
 import at.gv.egovernment.moa.id.auth.exception.AuthenticationException;
@@ -88,7 +90,7 @@ import at.gv.egovernment.moa.util.URLDecoder;
  * @author Paul Ivancsics
  * @version $Id$
  */
-public class AuthServlet extends HttpServlet implements MOAIDAuthConstants {
+public class AuthServlet extends AbstractAuthSourceServlet implements MOAIDAuthConstants {
 
 	/**
 	 * 
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
new file mode 100644
index 000000000..a2b25e24e
--- /dev/null
+++ b/id/server/idserverlib/src/main/resources/resources/processes/DefaultAuthentication.process.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<pd:ProcessDefinition id="DefaultAuthentication" xmlns:pd="http://www.datentechnik.com/process-engine/processdefinition/v1">

+

+<!--

+	- National authentication with Austrian Citizen Card and mobile signature.

+	- Legacy authentication for foreign citizens using MOCCA supported signature cards.

+-->

+

+	<pd:StartEvent id="start" />

+

+	<pd:Transition from="start" to="end" />

+

+	<pd:EndEvent id="end" />

+

+</pd:ProcessDefinition>

diff --git a/pom.xml b/pom.xml
index c5973a4ab..9a77ada22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,9 @@
 		<moa-spss-version>2.0.4-SNAPSHOT</moa-spss-version>

 		<configtool-version>1.1.5-SNAPSHOT</configtool-version>

 		<demo-oa-version>2.0.3-SNAPSHOT</demo-oa-version>

+		

+		<org.springframework.version>4.1.4.RELEASE</org.springframework.version>

+

     </properties>

 

     <profiles>

@@ -545,6 +548,13 @@
                 <version>2.7.2</version><!-- xalan version -->

                 <scope>runtime</scope>

             </dependency>

+            

+			<dependency>

+				<groupId>org.springframework</groupId>

+				<artifactId>spring-webmvc</artifactId>

+				<version>${org.springframework.version}</version>

+			</dependency>

+			

         </dependencies>

     </dependencyManagement>