From 9bafb2671b297d39574c346c896347f197282081 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 18 Feb 2016 19:21:10 +0100
Subject: remove AXIS1 implemented WebService for SAML1  --> now a simple
 Spring controller is used as WebService endpoint

---
 id/server/auth/pom.xml                             | 21 ++++++----------
 .../src/main/webapp/WEB-INF/server-config.wsdd     | 29 ----------------------
 id/server/auth/src/main/webapp/WEB-INF/web.xml     |  4 +--
 3 files changed, 10 insertions(+), 44 deletions(-)
 delete mode 100644 id/server/auth/src/main/webapp/WEB-INF/server-config.wsdd

(limited to 'id/server/auth')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index c50d4ce47..b9c55148c 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -91,15 +91,6 @@
 
 
         <!-- we need Axis 1.1 here, 1.0 is included in SPSS -->
-		<dependency>
-			<groupId>axis</groupId>
-			<artifactId>axis</artifactId>
-		</dependency>
-		<dependency>
-    		<groupId>org.tuckey</groupId>
-    		<artifactId>urlrewritefilter</artifactId>
-    		<version>4.0.4</version>
-		</dependency>
 		<dependency>
 			<groupId>MOA.spss.server</groupId>
 			<artifactId>moa-spss-lib</artifactId>
@@ -108,14 +99,14 @@
 					<artifactId>iaik_pki_module</artifactId>
 					<groupId>iaik</groupId>
 				</exclusion>
-				<exclusion>
-					<artifactId>axis-wsdl4j</artifactId>
-					<groupId>axis</groupId>
-				</exclusion>
 				<exclusion>
 					<groupId>commons-logging</groupId>
 					<artifactId>commons-logging</artifactId>
 				</exclusion>
+				<exclusion>
+					<artifactId>axis-wsdl4j</artifactId>
+					<groupId>axis</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -130,6 +121,10 @@
 					<groupId>ch.qos.logback</groupId>
 					<artifactId>logback-classic</artifactId>
 				</exclusion>
+				<exclusion>
+					<artifactId>axis</artifactId>
+					<groupId>axis</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		
diff --git a/id/server/auth/src/main/webapp/WEB-INF/server-config.wsdd b/id/server/auth/src/main/webapp/WEB-INF/server-config.wsdd
deleted file mode 100644
index 121ec3cf9..000000000
--- a/id/server/auth/src/main/webapp/WEB-INF/server-config.wsdd
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment name="defaultClientConfig"
-            xmlns="http://xml.apache.org/axis/wsdd/"
-            xmlns:java="http://xml.apache.org/axis/wsdd/providers/java"
-            xmlns:handler="http://xml.apache.org/axis/wsdd/providers/handler">
-
-  <handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/>
-  <handler name="MsgDispatcher" type="java:org.apache.axis.providers.java.MsgProvider"/>
-  <handler name="HTTPAuthHandler" type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/>
-
-  <service name="GetAuthenticationData" provider="java:MSG">
-    <namespace>urn:oasis:names:tc:SAML:1.0:protocol</namespace>
-    <parameter name="allowedMethods" value="Request"/>
-    <parameter name="className" value="at.gv.egovernment.moa.id.protocols.saml1.GetAuthenticationDataService"/>
-    <wsdlFile>/resources/wsdl/MOA-ID-1.x.wsdl</wsdlFile>
-    <requestFlow>
-    </requestFlow>
-    <responseFlow>
-    </responseFlow>
-  </service>
-
-  <transport name="http">
-    <requestFlow>
-      <handler type="URLMapper"/>
-      <handler type="HTTPAuthHandler"/>
-    </requestFlow>
-  </transport>
-
-</deployment>
diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml
index 4b129f374..92dcf1266 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -112,7 +112,7 @@
 		<url-pattern>/idpSingleLogout</url-pattern>
 	</servlet-mapping> -->
 	
-	<servlet>
+<!-- 	<servlet>
 		<display-name>Apache-Axis Servlet</display-name>
 		<servlet-name>AxisServlet</servlet-name>
 		<servlet-class>org.apache.axis.transport.http.AxisServlet</servlet-class>
@@ -120,7 +120,7 @@
 	<servlet-mapping>
 		<servlet-name>AxisServlet</servlet-name>
 		<url-pattern>/services/*</url-pattern>
-	</servlet-mapping>
+	</servlet-mapping> -->
 
 <!-- 	<servlet>
 		<display-name>Dispatcher Servlet</display-name>
-- 
cgit v1.2.3