From 387169d0d5f022dea6ad5cd5ecc5a31ce9bf21d9 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Mon, 11 May 2015 14:29:43 +0200
Subject: velocity engine init exception handling

---
 .../at/gv/egovernment/moa/id/configuration/auth/pvp2/PVP2Utils.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'id/ConfigWebTool')

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/PVP2Utils.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/PVP2Utils.java
index 3d66a4b19..3b2e0bd08 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/PVP2Utils.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/pvp2/PVP2Utils.java
@@ -125,7 +125,10 @@ public class PVP2Utils {
 			log.warn("Encode PVP 2.1 message FAILED.", e);
 			throw new PVP2Exception("Encode PVP 2.1 message FAILED.", e);
 			
-		}		
+		} catch (Exception ex) {
+            log.warn("Initialization exception", ex);
+            throw new PVP2Exception("Initializing Velocity engine FAILED.", ex);
+        }
 	}
 	
 
-- 
cgit v1.2.3


From 231da432bd3d174aeee5610116856194c79f75aa Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Mon, 11 May 2015 18:56:58 +0200
Subject: fixing dependency colision due to different library versions used in
 moa and samlengine

---
 id/ConfigWebTool/pom.xml | 6 +++++-
 pom.xml                  | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'id/ConfigWebTool')

diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml
index 423d442d0..aa4c9055c 100644
--- a/id/ConfigWebTool/pom.xml
+++ b/id/ConfigWebTool/pom.xml
@@ -144,7 +144,11 @@
 							</exclusion>
 						</exclusions>
         </dependency>
-
+        <dependency>
+        <groupId>org.opensaml</groupId>
+        <artifactId>openws</artifactId>
+        <version>${openws-version}</version>
+        </dependency>
 				<dependency>
 					<groupId>org.bouncycastle</groupId>
 					<artifactId>bcprov-jdk16</artifactId>
diff --git a/pom.xml b/pom.xml
index 2ecc43a21..0bb052ce3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,12 +28,13 @@
 			<moa-spss-version>2.0.5-SNAPSHOT</moa-spss-version>
 			<configtool-version>1.1.7-SNAPSHOT</configtool-version>
 			<demo-oa-version>2.0.5-SNAPSHOT</demo-oa-version>
-		
+
 			<!-- Library Versions -->
 			<org.springframework.version>4.1.6.RELEASE</org.springframework.version>
 			<surefire.version>2.18.1</surefire.version>		
 			<opensaml.version>2.6.5</opensaml.version>
-			<xmltooling.version>1.4.5</xmltooling.version>
+            <openws-version>1.5.3</openws-version>
+            <xmltooling.version>1.4.5</xmltooling.version>
 			<cxf.version>3.0.4</cxf.version>
 			<struts.version>2.3.20</struts.version>
 			<egovutils.version>2.0.0</egovutils.version>
-- 
cgit v1.2.3