From 450d036e56f6e2396bd7be2da244b8cfa5a5801f Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 18 Nov 2013 11:28:05 +0100
Subject: X509TrustManager Update

---
 id/ConfigWebTool/pom.xml                                          | 8 ++++----
 id/pom.xml                                                        | 2 +-
 id/server/auth/.settings/org.eclipse.wst.common.component         | 6 ------
 id/server/auth/pom.xml                                            | 2 +-
 id/server/idserverlib/pom.xml                                     | 2 +-
 .../at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java   | 2 +-
 id/server/moa-id-commons/pom.xml                                  | 2 +-
 id/server/pom.xml                                                 | 2 +-
 id/server/proxy/.settings/org.eclipse.wst.common.component        | 6 ------
 id/server/proxy/pom.xml                                           | 2 +-
 10 files changed, 11 insertions(+), 23 deletions(-)

(limited to 'id')

diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml
index c847d9026..3ef980bca 100644
--- a/id/ConfigWebTool/pom.xml
+++ b/id/ConfigWebTool/pom.xml
@@ -2,13 +2,13 @@
 	<parent>
   	<groupId>MOA</groupId>
     <artifactId>id</artifactId>
-    <version>1.9.96-SNAPSHOT</version>
+    <version>1.9.97-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
   <groupId>MOA.id</groupId>
   <artifactId>ConfigurationInterface</artifactId>
-  <version>0.9.5</version>
+  <version>0.9.6</version>
   <packaging>war</packaging>
   <name>MOA-ID 2.0 Configuration Tool</name>
   <description>Web based Configuration Tool for MOA-ID 2.x</description>
@@ -34,12 +34,12 @@
       <dependency>
     		<groupId>MOA.id.server</groupId>
     		<artifactId>moa-id-commons</artifactId>
-    		<version>1.9.96-SNAPSHOT</version>
+    		<version>1.9.97-SNAPSHOT</version>
     	</dependency>
       <dependency>
     		<groupId>MOA.id.server</groupId>
     		<artifactId>moa-id-lib</artifactId>
-    		<version>1.9.96-SNAPSHOT</version>
+    		<version>1.9.97-SNAPSHOT</version>
     	</dependency>
       
       <dependency>
diff --git a/id/pom.xml b/id/pom.xml
index 22bbeca65..601b3c3ad 100644
--- a/id/pom.xml
+++ b/id/pom.xml
@@ -9,7 +9,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>id</artifactId>
     <packaging>pom</packaging>
-    <version>1.9.96-SNAPSHOT</version>
+    <version>1.9.97-SNAPSHOT</version>
     <name>MOA ID</name>
 
     <modules>
diff --git a/id/server/auth/.settings/org.eclipse.wst.common.component b/id/server/auth/.settings/org.eclipse.wst.common.component
index 40733a1ce..2250777cb 100644
--- a/id/server/auth/.settings/org.eclipse.wst.common.component
+++ b/id/server/auth/.settings/org.eclipse.wst.common.component
@@ -6,15 +6,9 @@
         <dependent-module archiveName="moa-common-2.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="moa-id-lib-1.9.96-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <dependent-module archiveName="stork-saml-engine-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/stork-saml-engine/stork-saml-engine">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="moa-id-commons-1.9.96-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-commons/moa-id-commons">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
     <property name="context-root" value="moa-id-auth"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 3423deb79..350087e40 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>1.9.96-SNAPSHOT</version>
+		<version>1.9.97-SNAPSHOT</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index ab1a28091..d65a562f8 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>1.9.96-SNAPSHOT</version>
+		<version>1.9.97-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
index 234641b4a..b4564cef9 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
@@ -263,7 +263,7 @@ public class DispatcherServlet extends AuthServlet{
 								for (String el : mapkeys) {
 									IRequest value = protocolRequests.get(el);
 						
-									if (value.getOAURL().equals(protocolRequest.getOAURL())) {
+									if (value.getOAURL() != null && value.getOAURL().equals(protocolRequest.getOAURL())) {
 								
 										if(!AuthenticationSessionStoreage.deleteSessionWithPendingRequestID(el)) {
 											Logger.warn(DispatcherServlet.class.getName()+": NO MOASession with PendingRequestID " + el + " found. Delete all user sessions!");
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 94726fa16..9ec756f85 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>MOA.id</groupId>
     <artifactId>moa-id</artifactId>
-    <version>1.9.96-SNAPSHOT</version>
+    <version>1.9.97-SNAPSHOT</version>
   </parent>
   <artifactId>moa-id-commons</artifactId>
   <name>moa-id-commons</name>
diff --git a/id/server/pom.xml b/id/server/pom.xml
index a3461e956..0f9531abf 100644
--- a/id/server/pom.xml
+++ b/id/server/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>MOA</groupId>
         <artifactId>id</artifactId>
-        <version>1.9.96-SNAPSHOT</version>
+        <version>1.9.97-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/id/server/proxy/.settings/org.eclipse.wst.common.component b/id/server/proxy/.settings/org.eclipse.wst.common.component
index e1f55f641..5ef4c6bfe 100644
--- a/id/server/proxy/.settings/org.eclipse.wst.common.component
+++ b/id/server/proxy/.settings/org.eclipse.wst.common.component
@@ -6,15 +6,9 @@
         <dependent-module archiveName="moa-common-2.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="moa-id-lib-1.9.96-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <dependent-module archiveName="stork-saml-engine-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/stork-saml-engine/stork-saml-engine">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="moa-id-commons-1.9.96-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-commons/moa-id-commons">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
     <property name="context-root" value="moa-id-proxy"/>
     <wb-resource deploy-path="/" source-path="src/main/webapp"/>
     <property name="java-output-path" value="/target/classes"/>
diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index c7cb9a7c8..212ddda71 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>1.9.96-SNAPSHOT</version>
+		<version>1.9.97-SNAPSHOT</version>
 	</parent>
 	
 	<properties>
-- 
cgit v1.2.3