From b445b300db3a6895647f7f939f63e6b1f52ac0a3 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Tue, 25 Nov 2014 12:03:02 +0100
Subject: Fix build.

- Remove svn metadata.
- Fix local repository (inappropriate xalan-bin-dist dependency file names and copy-past error in dependency pom).
- Switch jdk 1.5/1.6 to 1.7.
- Exclude non working tests.
---
 id/server/idserverlib/pom.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 65004490b..fc48d87ac 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -432,8 +432,8 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.7</source>
+					<target>1.7</target>
 				</configuration>
 			</plugin>
 			
@@ -462,11 +462,10 @@
 						</tag>
 					</tags>
 					<links>
-						<link>http://java.sun.com/j2se/1.4/docs/api/</link>
-						<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+						<link>http://docs.oracle.com/javase/7/docs/api/</link>
 						<link>http://logging.apache.org/log4j/docs/api/</link>
 					</links>
-					<target>1.5</target>
+					<target>1.7</target>
 				</configuration>
 				<executions>
 					<execution>
-- 
cgit v1.2.3


From e6e2bbf9a6e4df5e714ab10babae013317bf8422 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Fri, 16 Jan 2015 15:11:48 +0100
Subject: Add dti-process-engine support.

---
 id/server/idserverlib/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'id/server/idserverlib/pom.xml')

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>
-- 
cgit v1.2.3


From b69370ec35821527832e2337c39486aec32f469a Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Mon, 19 Jan 2015 08:25:08 +0100
Subject: Add javax.servlet:javax.servlet-api dependency.

---
 id/server/idserverlib/pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index ba06ce142..530e00d74 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -370,6 +370,12 @@
 			<artifactId>google-oauth-client-jetty</artifactId>
 			<version>1.19.0</version>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.mortbay.jetty</groupId>
+					<artifactId>servlet-api</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<!-- TestNG -->
@@ -405,6 +411,11 @@
 			<artifactId>dti-process-engine-spring-web</artifactId>
 			<version>${com.datentechnik.process-engine.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
 
 	</dependencies>
 
-- 
cgit v1.2.3


From 38ae8cb883ab73603f490d62b4cac38c51ac43e1 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 19 Jan 2015 12:10:48 +0100
Subject: update libraries  -> joda-time 2.7  -> slf4j 2.7.10  -> struts2
 2.3.20  -> commons-codec 1.10  -> hibernate 4.3.8.Final  -> mySQL-connector
 5.1.34  -> opensaml 2.6.4  -> xmltooling 2.6.4

---
 id/server/idserverlib/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 65004490b..44a6c3e60 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -352,7 +352,7 @@
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.9</version>
+			<version>1.10</version>
 		</dependency>
 
 		<!-- Google OAuth Client -->
-- 
cgit v1.2.3


From d45b41a740a6267c78a6ea27b7617c3d317db837 Mon Sep 17 00:00:00 2001
From: Christian Wagner <c.wagner@datentechnik-innovation.com>
Date: Thu, 29 Jan 2015 08:18:00 +0100
Subject: integrate process engine from project 'dti-process-engine' -
 INCOMPLETE!

  - commit neccessary in order to avoid blocking the development process

additional small fix due to earlier package renaming
---
 id/server/idserverlib/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 530e00d74..0b3319111 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -406,11 +406,6 @@
 			</exclusions>
 		</dependency>
 
-		<dependency>
-			<groupId>com.datentechnik.process-engine</groupId>
-			<artifactId>dti-process-engine-spring-web</artifactId>
-			<version>${com.datentechnik.process-engine.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
-- 
cgit v1.2.3


From 90c4f8e9a6140b97469357deb906b8816f5f680c Mon Sep 17 00:00:00 2001
From: Gerwin Gsenger <g.gsenger@datentechnik-innovation.at>
Date: Thu, 29 Jan 2015 12:18:11 +0100
Subject: integrate process engine from project 'dti-process-engine'

---
 id/server/idserverlib/pom.xml | 72 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 59 insertions(+), 13 deletions(-)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 0b3319111..70d3f9e01 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -15,7 +15,6 @@
 
 	<properties>
 		<repositoryPath>${basedir}/../../../repository</repositoryPath>
-		<com.datentechnik.process-engine.version>0.0.1-SNAPSHOT</com.datentechnik.process-engine.version>
 	</properties>
 
 	<repositories>
@@ -25,13 +24,19 @@
 			<url>https://build.shibboleth.net/nexus/content/groups/public/</url>
 		</repository>
 	</repositories>
-	
+
 	<dependencies>
-     <dependency>
-     	<groupId>eu.stork</groupId>
-      <artifactId>oasis-dss-api</artifactId>
-      <version>1.0.0-RELEASE</version>
-    </dependency>
+	<dependency>
+		<groupId>eu.stork</groupId>
+		<artifactId>oasis-dss-api</artifactId>
+		<version>1.0.0-RELEASE</version>
+		<exclusions>
+			<exclusion>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-io</artifactId>
+			</exclusion>
+		</exclusions>
+	</dependency>
     
     <dependency>
     		<groupId>MOA.id.server</groupId>
@@ -219,12 +224,7 @@
             <artifactId>jul-to-slf4j</artifactId>
             <version>1.7.6</version>
         </dependency> -->
-		
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
+
  		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
@@ -412,6 +412,52 @@
 			<scope>provided</scope>
 		</dependency>
 
+		<!-- testing -->
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<scope>test</scope>
+			</dependency>
+
+			<!-- tools -->
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-collections4</artifactId>
+			</dependency>
+			<dependency>
+				<groupId>commons-io</groupId>
+				<artifactId>commons-io</artifactId>
+			</dependency>
+
+			<!-- spring -->
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-core</artifactId>
+				<exclusions>
+					<exclusion>
+						<groupId>commons-logging</groupId>
+						<artifactId>commons-logging</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-expression</artifactId>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-context</artifactId>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-webmvc</artifactId>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-test</artifactId>
+				<scope>test</scope>
+			</dependency>
+
 	</dependencies>
 
 	<build>
-- 
cgit v1.2.3


From 730cb523e5d29dee54c7fb1c0219efa879362813 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Fri, 30 Jan 2015 15:09:35 +0100
Subject: Exclude non-working tests.

- exclude at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest
- exclude at/gv/egovernment/moa/id/process/test/ProcessEngineTest
---
 id/server/idserverlib/pom.xml | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 7666db141..102bec7bd 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -489,15 +489,30 @@
 	        </executions>
 	      </plugin>
 
-        		        		
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
-			</plugin>
+
+		<plugin>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-compiler-plugin</artifactId>
+			<configuration>
+				<source>1.7</source>
+				<target>1.7</target>
+			</configuration>
+			<executions>
+				<execution>
+					<id>default-testCompile</id>
+					<phase>test-compile</phase>
+					<configuration>
+						<testExcludes>
+	                		<exclude>at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest.java</exclude>
+	                		<exclude>at/gv/egovernment/moa/id/process/test/ProcessEngineTest.java</exclude>
+						</testExcludes>
+					</configuration>
+					<goals>
+						<goal>testCompile</goal>
+					</goals>
+				</execution>
+			</executions>
+		</plugin>
 			
 						<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -557,7 +572,9 @@
 					</execution>
 				</executions>
 			</plugin>
+
 		</plugins>
+
 	</build>
 
 </project>
-- 
cgit v1.2.3


From 01b98af095d8b7f4c33b89e321b3c4c17c597307 Mon Sep 17 00:00:00 2001
From: Christian Wagner <c.wagner@datentechnik-innovation.com>
Date: Fri, 6 Feb 2015 09:12:22 +0100
Subject: adjust process engine tests to process instance persistence

---
 id/server/idserverlib/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 102bec7bd..15a1e8cfc 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -419,6 +419,13 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+			<version>1.4.178</version>
+			<scope>runtime</scope>
+		</dependency>
+
 		<!-- tools -->
 		<dependency>
 			<groupId>org.apache.commons</groupId>
-- 
cgit v1.2.3


From c1af54026407f7150d2a61d15e9719ae878c7375 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Fri, 6 Feb 2015 09:46:17 +0100
Subject: Enable process engine tests

- Remove text exclusions.
- Remove test-ng dependency (for junit compatibility reasons).
---
 id/server/idserverlib/pom.xml | 31 -------------------------------
 1 file changed, 31 deletions(-)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 15a1e8cfc..c0021f25e 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -378,13 +378,6 @@
 			</exclusions>
 		</dependency>
 
-		<!-- TestNG -->
-		<dependency>
-			<groupId>org.testng</groupId>
-			<artifactId>testng</artifactId>
-			<version>6.1.1</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>eu.stork</groupId>
 			<artifactId>DocumentService</artifactId>
@@ -497,30 +490,6 @@
 	      </plugin>
 
 
-		<plugin>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-compiler-plugin</artifactId>
-			<configuration>
-				<source>1.7</source>
-				<target>1.7</target>
-			</configuration>
-			<executions>
-				<execution>
-					<id>default-testCompile</id>
-					<phase>test-compile</phase>
-					<configuration>
-						<testExcludes>
-	                		<exclude>at/gv/egovernment/moa/id/process/spring/test/SpringExpressionAwareProcessEngineTest.java</exclude>
-	                		<exclude>at/gv/egovernment/moa/id/process/test/ProcessEngineTest.java</exclude>
-						</testExcludes>
-					</configuration>
-					<goals>
-						<goal>testCompile</goal>
-					</goals>
-				</execution>
-			</executions>
-		</plugin>
-			
 						<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-- 
cgit v1.2.3


From 271e22add71f0260f5d421844a2171a09093f505 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Fri, 6 Feb 2015 11:09:59 +0100
Subject: Code cleanup

- Set moa-id version to 2.2.0-SNAPSHOT.
- Fix Javadoc syntax issues in newly added classes.
- Add warning log when executing deprecated auth sources.
---
 id/server/idserverlib/pom.xml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index c0021f25e..8045ed8da 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -26,6 +26,13 @@
 	</repositories>
 
 	<dependencies>
+		<!-- TestNG -->
+		<dependency>
+			<groupId>org.testng</groupId>
+			<artifactId>testng</artifactId>
+			<version>6.1.1</version>
+			<scope>test</scope>
+		</dependency>
 	<dependency>
 		<groupId>eu.stork</groupId>
 		<artifactId>oasis-dss-api</artifactId>
@@ -549,6 +556,27 @@
 				</executions>
 			</plugin>
 
+			<!-- enable co-existence of testng and junit -->
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>${surefire.version}</version>
+				<configuration>
+					<threadCount>1</threadCount>
+				</configuration>
+				<dependencies>
+					<dependency>
+						<groupId>org.apache.maven.surefire</groupId>
+						<artifactId>surefire-junit47</artifactId>
+						<version>${surefire.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>org.apache.maven.surefire</groupId>
+						<artifactId>surefire-testng</artifactId>
+						<version>${surefire.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+
 		</plugins>
 
 	</build>
-- 
cgit v1.2.3


From 5e085447e8560df030af5c4a72e6cb17beb6c760 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 20 Feb 2015 08:58:26 +0100
Subject: update outdated library

---
 id/server/idserverlib/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index cab3c73e1..dbfc19b68 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -356,9 +356,19 @@
 					<groupId>javax.servlet</groupId>
 					<artifactId>servlet-api</artifactId>
 				</exclusion>
+				<exclusion>
+					<artifactId>google-collections</artifactId>
+					<groupId>com.google.collections</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>18.0</version>
+		</dependency>
+
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-- 
cgit v1.2.3


From d28e5b6e0d0793558f3328c5a420c17bdd606104 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 16 Apr 2015 13:48:50 +0200
Subject: update library versions

---
 id/server/idserverlib/pom.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index dbfc19b68..9465b56d1 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -113,8 +113,6 @@
 		   <dependency>
             <groupId>at.gv.util</groupId>
             <artifactId>egovutils</artifactId>
-            <!-- <version>1.0.7</version> -->
-            <version>2.0.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.sun</groupId>
@@ -142,6 +140,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
+				
+		  <dependency>
+        	<groupId>org.apache.cxf</groupId>
+        	<artifactId>cxf-rt-frontend-jaxws</artifactId>
+    	</dependency>
+    	<dependency>
+        	<groupId>org.apache.cxf</groupId>
+        	<artifactId>cxf-rt-transports-http</artifactId>
+    	</dependency>
+		
 		
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
-- 
cgit v1.2.3


From 3060411f3e02094e5d3dbd44f1037cfd3ce4c5aa Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Mon, 11 May 2015 16:47:25 +0200
Subject: adjustments for idea deployment

---
 id/server/idserverlib/pom.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'id/server/idserverlib/pom.xml')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 9465b56d1..19e81c36d 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -49,6 +49,23 @@
     		<groupId>MOA.id.server</groupId>
     		<artifactId>moa-id-commons</artifactId>
     </dependency>
+
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-c3p0</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-entitymanager</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+
     
 <!--         <dependency>
             <groupId>eu.stork</groupId>
@@ -66,6 +83,7 @@
 			<artifactId>moa-common</artifactId>
 			<type>jar</type>
 		</dependency>
+
 		<dependency>
 			<groupId>MOA</groupId>
 			<artifactId>moa-common</artifactId>
@@ -454,6 +472,12 @@
 			<artifactId>commons-io</artifactId>
 		</dependency>
 
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${org.apache.commons.lang3.version}</version>
+        </dependency>
+
 		<!-- spring -->
 		<dependency>
 			<groupId>org.springframework</groupId>
-- 
cgit v1.2.3