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.
---
 spss/server/serverlib/pom.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'spss/server/serverlib')

diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index da78d3dc1..e16d46d43 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -301,11 +301,10 @@
 						</group>
 					</groups>
 					<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 443787eddd778e5388cba643413531981edc50ed Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Mon, 23 Mar 2015 13:42:33 +0100
Subject: error message when a keygroup is not found

---
 .../moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'spss/server/serverlib')

diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java
index d1281c1f1..6a85415f8 100644
--- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java
@@ -145,7 +145,12 @@ public class XMLSignatureCreationProfileFactory {
     // get the key group id
     String keyGroupID = request.getKeyIdentifier();
     // get digest method on key group level (if configured)
-    String configDigestMethodKG = config.getKeyGroup(keyGroupID).getDigestMethodAlgorithm();
+    KeyGroup keygroup = config.getKeyGroup(keyGroupID);
+    if(null == keygroup) {
+        Logger.error("Could not find key group '" + keyGroupID + "'");
+        throw new MOAApplicationException("2231", null);
+    }
+    String configDigestMethodKG = keygroup.getDigestMethodAlgorithm();
     // get default digest method (if configured)
     String configDigestMethod = config.getDigestMethodAlgorithmName();
     
-- 
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 ++++++++++++++++++++++++
 id/server/moa-id-commons/pom.xml | 10 +++++++++-
 spss/server/serverlib/pom.xml    | 10 +++++++++-
 3 files changed, 42 insertions(+), 2 deletions(-)

(limited to 'spss/server/serverlib')

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>
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 27beeaaf3..05fd67568 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -76,8 +76,16 @@
             <artifactId>moa-common</artifactId>
             <type>jar</type>
         </dependency>
+<!--
+        <dependency>
+            <groupId>MOA</groupId>
+            <artifactId>moa-common</artifactId>
+            <type>compile</type>
+        </dependency>
+-->
 
-				<dependency>
+
+        <dependency>
 					<groupId>iaik.prod</groupId>
 					<artifactId>iaik_X509TrustManager</artifactId>
 				</dependency>
diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index e16d46d43..504b0dc84 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -129,7 +129,15 @@
 			<artifactId>moa-common</artifactId>
 			<type>jar</type>
 		</dependency>
-		
+<!--
+        <dependency>
+            <groupId>MOA</groupId>
+            <artifactId>moa-common</artifactId>
+            <type>compile</type>
+        </dependency>
+-->
+
+
 		<dependency>
 			<groupId>MOA</groupId>
 			<artifactId>moa-common</artifactId>
-- 
cgit v1.2.3