Merge branch 'Branch_MOA-ID-3.2.1' into development_preview

# Conflicts:
#	id/server/moa-id-commons/pom.xml
#	pom.xml

3 files changed, 0 insertions, 115 deletions

diff --git a/spss/server/serverws/src/main/webapp/META-INF/MANIFEST.MF b/spss/server/serverws/src/main/webapp/META-INF/MANIFEST.MF
deleted file mode 100644
index 5e9495128..000000000
--- a/spss/server/serverws/src/main/webapp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0

-Class-Path: 

-

diff --git a/spss/server/serverws/src/main/webapp/WEB-INF/server-config.wsdd b/spss/server/serverws/src/main/webapp/WEB-INF/server-config.wsdd
deleted file mode 100644
index 43e748734..000000000
--- a/spss/server/serverws/src/main/webapp/WEB-INF/server-config.wsdd
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  Axis Deployment Descriptor for MOA SP/SS 2

--->

-<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"/>

-  <handler name="MOAHandler" type="java:at.gv.egovernment.moa.spss.server.service.AxisHandler"/>

-

-  <service name="SignatureCreation" provider="java:MSG">

-    <namespace>http://reference.e-government.gv.at/namespace/moa/20020822#</namespace>

-    <parameter name="allowedMethods" value="CreateCMSSignatureRequest CreateXMLSignatureRequest"/>

-    <parameter name="className" value="at.gv.egovernment.moa.spss.server.service.SignatureCreationService"/>

-    <wsdlFile>/resources/schemas/MOA-SPSS-2.0.0.wsdl</wsdlFile>

-    

-    <requestFlow>

-      <handler type="MOAHandler"/>

-    </requestFlow>

-    <responseFlow>

-      <handler type="MOAHandler"/>

-    </responseFlow>

-  </service>

-

-  <service name="SignatureVerification" provider="java:MSG">

-    <namespace>http://reference.e-government.gv.at/namespace/moa/20020822#</namespace>

-    <parameter name="allowedMethods" value="VerifyCMSSignatureRequest VerifyXMLSignatureRequest"/>

-    <parameter name="className" value="at.gv.egovernment.moa.spss.server.service.SignatureVerificationService"/>

-        <wsdlFile>/resources/schemas/MOA-SPSS-2.0.0.wsdl</wsdlFile>

-    <requestFlow>

-      <handler type="MOAHandler"/>

-    </requestFlow>

-    <responseFlow>

-      <handler type="MOAHandler"/>

-    </responseFlow>

-  </service>

-

-  <transport name="http">

-    <requestFlow>

-      <handler type="URLMapper"/>

-      <handler type="HTTPAuthHandler"/>

-    </requestFlow>

-  </transport>

-

-</deployment>

diff --git a/spss/server/serverws/src/main/webapp/WEB-INF/web.xml b/spss/server/serverws/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 5de9f1d9c..000000000
--- a/spss/server/serverws/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
-  <display-name>MOA SP-SS</display-name>
-  <description>MOA Signature Creation and Verification Services</description>
-  <servlet>
-    <servlet-name>ConfigurationServlet</servlet-name>
-    <display-name>MOA Configuration Servlet</display-name>
-    <servlet-class>at.gv.egovernment.moa.spss.server.service.ConfigurationServlet</servlet-class>
-    <load-on-startup>0</load-on-startup>
-  </servlet>
-  <servlet>
-    <servlet-name>AxisServlet</servlet-name>
-    <display-name>Apache-Axis Servlet</display-name>
-    <servlet-class>
-      org.apache.axis.transport.http.AxisServlet
-    </servlet-class>
-  </servlet>
-  <servlet>
-      <servlet-name>CertificateProviderServlet</servlet-name>
-    <display-name>MOA Certificate Provider Servlet</display-name>
-    <servlet-class>at.gv.egovernment.moa.spss.server.service.CertificateProviderServlet</servlet-class>
-    <load-on-startup>0</load-on-startup>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>AxisServlet</servlet-name>
-    <url-pattern>/services/*</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>ConfigurationServlet</servlet-name>
-    <url-pattern>/ConfigurationUpdate</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>CertificateProviderServlet</servlet-name>
-    <url-pattern>/Certificate</url-pattern>
-  </servlet-mapping>
-
-  <security-constraint>
-    <web-resource-collection>
-      <web-resource-name>ConfigurationUpdate</web-resource-name>
-      <url-pattern>/ConfigurationUpdate</url-pattern>
-    </web-resource-collection>
-    <auth-constraint>
-      <role-name>moa-admin</role-name>
-    </auth-constraint>
-  </security-constraint>
-
-  <login-config>
-    <auth-method>BASIC</auth-method>
-    <realm-name>UserDatabase</realm-name>
-  </login-config>
-
-  <security-role>
-    <description>
-      The role that is required to log in to the moa Application
-    </description>
-    <role-name>moa-admin</role-name>
-  </security-role>
-</web-app>