From 43e57a42832ea8b4ceb0317f3c9028a4174ffa7b Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 8 Aug 2007 07:25:32 +0000
Subject: Adapted project directory structure to suit the new maven based build
 process.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@909 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 .../src/main/webapp/WEB-INF/server-config.wsdd     |  29 ++++++
 id/server/auth/src/main/webapp/WEB-INF/web.xml     | 113 +++++++++++++++++++++
 id/server/auth/src/main/webapp/errorpage-auth.jsp  |  50 +++++++++
 id/server/auth/src/main/webapp/index.jsp           |  40 ++++++++
 id/server/auth/src/main/webapp/message-auth.jsp    |  20 ++++
 5 files changed, 252 insertions(+)
 create mode 100644 id/server/auth/src/main/webapp/WEB-INF/server-config.wsdd
 create mode 100644 id/server/auth/src/main/webapp/WEB-INF/web.xml
 create mode 100644 id/server/auth/src/main/webapp/errorpage-auth.jsp
 create mode 100644 id/server/auth/src/main/webapp/index.jsp
 create mode 100644 id/server/auth/src/main/webapp/message-auth.jsp

(limited to 'id/server/auth')

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
new file mode 100644
index 000000000..0f0eb49d1
--- /dev/null
+++ b/id/server/auth/src/main/webapp/WEB-INF/server-config.wsdd
@@ -0,0 +1,29 @@
+<?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.auth.servlet.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
new file mode 100644
index 000000000..603758fb8
--- /dev/null
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,113 @@
+<?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 ID Auth</display-name>
+	<description>MOA ID Authentication Service</description>
+	<servlet>
+		<servlet-name>SelectBKU</servlet-name>
+		<display-name>SelectBKU</display-name>
+		<description>Select Bürgerkartenartenumgebung</description>
+		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.SelectBKUServlet</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>StartAuthentication</servlet-name>
+		<display-name>StartAuthentication</display-name>
+		<description>Start authentication process</description>
+		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.StartAuthenticationServlet</servlet-class>
+		<load-on-startup>0</load-on-startup>
+	</servlet>
+	<servlet>
+		<servlet-name>VerifyIdentityLink</servlet-name>
+		<display-name>VerifyIdentityLink</display-name>
+		<description>Verify identity link coming from security layer</description>
+		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>VerifyAuthBlock</servlet-name>
+		<display-name>VerifyAuthBlock</display-name>
+		<description>Verify AUTH block coming from security layer</description>
+		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.VerifyAuthenticationBlockServlet</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>ConfigurationUpdate</servlet-name>
+		<display-name>ConfigurationUpdate</display-name>
+		<description>Update MOA-ID Auth configuration from the configuration file</description>
+		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.ConfigurationServlet</servlet-class>
+	</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>
+
+	<!-- JSP servlet -->
+	<servlet>
+        <servlet-name>jspservlet</servlet-name>
+        <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
+    </servlet>
+    
+	<!-- servlet mapping for jsp pages -->
+	<!-- errorpage.jsp (customizeable) -->
+	<servlet-mapping>
+        <servlet-name>jspservlet</servlet-name>
+        <url-pattern>/errorpage-auth.jsp</url-pattern>
+    </servlet-mapping>		
+    <!-- message.jsp (customizeable) used for non error messages (e.g. ConfigurationUpdate) -->
+	<servlet-mapping>
+        <servlet-name>jspservlet</servlet-name>
+        <url-pattern>/message-auth.jsp</url-pattern>
+    </servlet-mapping>		
+
+	<servlet-mapping>
+		<servlet-name>SelectBKU</servlet-name>
+		<url-pattern>/SelectBKU</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>StartAuthentication</servlet-name>
+		<url-pattern>/StartAuthentication</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>VerifyIdentityLink</servlet-name>
+		<url-pattern>/VerifyIdentityLink</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>VerifyAuthBlock</servlet-name>
+		<url-pattern>/VerifyAuthBlock</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>ConfigurationUpdate</servlet-name>
+		<url-pattern>/ConfigurationUpdate</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>AxisServlet</servlet-name>
+		<url-pattern>/services/*</url-pattern>
+	</servlet-mapping>
+	<session-config>
+		<session-timeout>30</session-timeout>
+	</session-config>
+	<error-page>
+		<error-code>500</error-code>
+		<location>/errorpage.jsp</location>
+	</error-page>
+	<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>
diff --git a/id/server/auth/src/main/webapp/errorpage-auth.jsp b/id/server/auth/src/main/webapp/errorpage-auth.jsp
new file mode 100644
index 000000000..07f3e7f69
--- /dev/null
+++ b/id/server/auth/src/main/webapp/errorpage-auth.jsp
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<%@ page contentType="text/html; charset=UTF-8" %>
+<html>
+<head>
+<title>Ein Fehler ist aufgetreten</title>
+</head>
+<% Throwable exceptionThrown = (Throwable)request.getAttribute("ExceptionThrown");
+   String errorMessage = (String)request.getAttribute("ErrorMessage");
+   String wrongParameters = (String)request.getAttribute("WrongParameters");
+%>
+
+<body>
+<h1>Fehler bei der Anmeldung</h1>
+<p>Bei der Anmeldung ist ein Fehler aufgetreten.</p>
+
+<% if (errorMessage != null) { %>
+<p>
+<%= errorMessage%><br>
+</p>
+<% } %>
+<% if (exceptionThrown != null) { %>
+<p> 
+<%= exceptionThrown.getMessage()%>
+</p>
+<% } %>
+<% if (wrongParameters != null) { %>
+<p>Die Angabe der Parameter ist unvollst&auml;ndig.<br></p>
+<b> <%= wrongParameters %> </b><br>
+<p>
+   Beispiele f&uuml;r korrekte Links zur MOA-ID Authentisierung sind:
+</p>
+<p>
+<tt>&lt;a href="https://&lt;MOA-URL&gt;/StartAuthentication?Target=&lt;Gesch&auml;ftsbereich&gt;&amp;OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&quot;&gt;</tt>
+</p>
+<p>
+<tt>&lt;a href="https://&lt;MOA-URL&gt;/SelectBKU?Target=&lt;Gesch&auml;ftsbereich&gt;&amp;OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&amp;BKUSelectionTemplate=&lt;BKU-Template-URL&gt;&quot;&gt;</tt>
+</p>
+<p>
+Im Falle einer Applikation aus dem privatwirtschaftlichen Bereich (type="businessService") entf&auml;llt die Angabe des <i>Target</i> Parameters:
+</p>
+<p>
+<tt>&lt;a href="https://&lt;MOA-URL&gt;/StartAuthentication?OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&quot;&gt;</tt>
+</p>
+<p>
+<tt>&lt;a href="https://&lt;MOA-URL&gt;/SelectBKU?OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&amp;BKUSelectionTemplate=&lt;BKU-Template-URL&gt;&quot;&gt;</tt>
+</p>
+<p>Die Angabe der Parameter <tt>&quot;Template&quot;</tt> und <tt>&quot;BKUSelectionTemplate&quot;</tt> ist optional.</p>
+<% } %>
+</body>
+</html>
\ No newline at end of file
diff --git a/id/server/auth/src/main/webapp/index.jsp b/id/server/auth/src/main/webapp/index.jsp
new file mode 100644
index 000000000..733ba317f
--- /dev/null
+++ b/id/server/auth/src/main/webapp/index.jsp
@@ -0,0 +1,40 @@
+<html>
+<head>
+<title>MOA ID Auth Sample Login</title>
+</head>
+<body>
+<% 
+  String urlPath = 
+	request.getScheme() + "://" 
+	+ request.getServerName() + ":" + request.getServerPort() 
+	+ request.getContextPath() + "/";
+  String params =
+	"Target=gb&" + 
+	"OA=https://localhost:8443/moa-id-proxy/index.jsp";
+  String urlStartAuth =
+  	urlPath +
+	"StartAuthentication?" + 
+	params;
+  String templateParam =
+    "&Template=http://localhost:18080/oa/AuthTemplate.jsp";
+  String urlStartAuthCustom =
+    urlStartAuth +
+    templateParam;
+  String urlSelectBKU = 
+  	urlPath +
+  	"SelectBKU?" +
+  	params;
+  String urlSelectBKUCustom = 
+  	urlSelectBKU +
+  	templateParam +
+  	"&BKUSelectionTemplate=http://localhost:18080/oa/BKUSelectionTemplate.jsp";
+%>
+<a href="<%=urlStartAuth%>">Log in to sample application</a>
+<br>
+<a href="<%=urlStartAuthCustom%>">Log in to sample application using custom form</a>
+<br>
+<a href="<%=urlSelectBKU%>">Choose BKU (HTMLComplete or HTMLSelect) and log in</a>
+<br>
+<a href="<%=urlSelectBKUCustom%>">Choose BKU (HTMLSelect) using custom form and log in</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/id/server/auth/src/main/webapp/message-auth.jsp b/id/server/auth/src/main/webapp/message-auth.jsp
new file mode 100644
index 000000000..0c28c1ba7
--- /dev/null
+++ b/id/server/auth/src/main/webapp/message-auth.jsp
@@ -0,0 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<%@ page contentType="text/html; charset=UTF-8" %>
+<html>
+<head>
+<title>MOA-ID AUTH</title>
+</head>
+<% String message = (String)request.getAttribute("Message");
+%>
+
+<body>
+<h1>MOA-ID AUTH</h1>
+
+<% if (message != null) { %>
+<p>
+<%= message%><br>
+</p>
+<% } %>
+
+</body>
+</html>
\ No newline at end of file
-- 
cgit v1.2.3


From bb444223c1b737319f473f6816566fa28b658cf5 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 8 Aug 2007 14:06:55 +0000
Subject: id mavenized

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@917 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/auth/assembly-war.xml |  94 ++++++++++++++++++++++++++
 id/server/auth/assembly.xml     |   7 ++
 id/server/auth/pom.xml          | 144 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 245 insertions(+)
 create mode 100644 id/server/auth/assembly-war.xml
 create mode 100644 id/server/auth/assembly.xml
 create mode 100644 id/server/auth/pom.xml

(limited to 'id/server/auth')

diff --git a/id/server/auth/assembly-war.xml b/id/server/auth/assembly-war.xml
new file mode 100644
index 000000000..15f10f4cb
--- /dev/null
+++ b/id/server/auth/assembly-war.xml
@@ -0,0 +1,94 @@
+<assembly>
+  <id>web</id>
+
+  <formats>
+    <format>war</format>
+  </formats>
+
+	<includeBaseDirectory>false</includeBaseDirectory>
+
+	<fileSets>
+		<fileSet>
+			<directory>${basedir}/src/main/webapp</directory>
+			<outputDirectory>/</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/../idserverlib/target/classes</directory>
+			<outputDirectory>WEB-INF/classes</outputDirectory>
+			<excludes>
+				<exclude>**/proxy/**</exclude>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/src/main/webapp</directory>
+			<outputDirectory>/</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/../resources/wsdl</directory>
+			<outputDirectory>resources/schema</outputDirectory>
+			<excludes>
+				<exclude>**/*.wsdl</exclude>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/../../../common/target</directory>
+			<outputDirectory>WEB-INF/lib</outputDirectory>
+			<includes>
+				<include>**/*.jar</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/../../../spss/server/serverlib/target</directory>
+			<outputDirectory>WEB-INF/lib</outputDirectory>
+			<includes>
+				<include>**/*.jar</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/../resources</directory>
+			<outputDirectory>WEB-INF/classes/resources</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/../services</directory>
+			<outputDirectory>WEB-INF/classes/META-INF/services</outputDirectory>
+		</fileSet>
+	</fileSets>
+
+	<dependencySets>
+	<dependencySet>
+		<includes>
+			<include>javaext:activation</include>
+			<include>axis:axis</include>
+			<include>commons-discovery:commons-discovery</include>
+			<include>commons-fileupload:commons-fileupload</include>
+			<include>commons-io:commons-io</include>
+			<include>commons-logging:commons-logging</include>
+			<include>jaxp:dom</include>
+			<include>iaik.prod:iaik_ixsil</include>
+			<include>iaik.prod:iaik_moa_full</include>
+			<include>iaik.prod:iaik_Pkcs11Wrapper</include>
+			<include>iaik.prod:iaik_X509TrustManager</include>
+			<include>jaxen:jaxen-core</include>
+			<include>jaxen:jaxen-dom</include>
+			<include>jaxp:jaxp-api</include>
+			<include>javax.xml:jaxrpc</include>
+			<include>mail:mail</include>
+			<include>saaj:saaj</include>
+			<include>jaxp:sax</include>
+			<include>jaxen:saxpath</include>
+			<include>wsdl4j:wsdl4j</include>
+			<include>regexp:regexp</include>
+			<include>log4j:log4j</include>
+			<include>postgresql:postgresql</include>
+	</includes>
+		<outputDirectory>WEB-INF/lib</outputDirectory>
+	</dependencySet>
+	<dependencySet>
+		<includes>
+			<include>iaik.win32:Pkcs11Wrapper</include>
+	</includes>
+		<outputDirectory>WEB-INF/lib/win32</outputDirectory>
+	</dependencySet>
+	</dependencySets>
+
+ </assembly>
\ No newline at end of file
diff --git a/id/server/auth/assembly.xml b/id/server/auth/assembly.xml
new file mode 100644
index 000000000..31709e6c5
--- /dev/null
+++ b/id/server/auth/assembly.xml
@@ -0,0 +1,7 @@
+<assembly>
+  <id>auth</id>
+  <formats>
+    <format>war</format>
+  </formats>
+
+ </assembly>
\ No newline at end of file
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
new file mode 100644
index 000000000..d2adcedfc
--- /dev/null
+++ b/id/server/auth/pom.xml
@@ -0,0 +1,144 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+		<groupId>MOA.id</groupId>
+		<artifactId>server</artifactId>
+		<version>1.4.0</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>MOA.id.server</groupId>
+  <artifactId>auth</artifactId>
+  <packaging>pom</packaging>
+  <version>1.4.0</version>
+  <name>MOA Id Server Auth</name>
+
+	<dependencies>
+    <dependency>
+      <groupId>javaext</groupId>
+      <artifactId>activation</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>axis</groupId>
+      <artifactId>axis</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-discovery</groupId>
+      <artifactId>commons-discovery</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+	    <dependency>
+	      <groupId>commons-logging</groupId>
+	      <artifactId>commons-logging</artifactId>
+	    </dependency>
+    <dependency>
+      <groupId>jaxp</groupId>
+      <artifactId>dom</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>iaik.prod</groupId>
+      <artifactId>iaik_ixsil</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>iaik.prod</groupId>
+      <artifactId>iaik_moa_full</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>iaik.prod</groupId>
+      <artifactId>iaik_Pkcs11Wrapper</artifactId>
+      <version>1.2.16</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>iaik.prod</groupId>
+      <artifactId>iaik_X509TrustManager</artifactId>
+    </dependency>
+	    <dependency>
+	      <groupId>jaxen</groupId>
+	      <artifactId>jaxen-core</artifactId>
+	    </dependency>
+	    <dependency>
+	      <groupId>jaxen</groupId>
+	      <artifactId>jaxen-dom</artifactId>
+	    </dependency>
+    <dependency>
+      <groupId>jaxp</groupId>
+      <artifactId>jaxp-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.xml</groupId>
+      <artifactId>jaxrpc-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>mail</groupId>
+      <artifactId>mail</artifactId>
+<!--      <version>1.5</version>-->
+    </dependency>
+    <dependency>
+      <groupId>saaj</groupId>
+      <artifactId>saaj</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jaxp</groupId>
+      <artifactId>sax</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jaxen</groupId>
+      <artifactId>saxpath</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>wsdl4j</groupId>
+      <artifactId>wsdl4j</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>regexp</groupId>
+      <artifactId>regexp</artifactId>
+    </dependency>
+ 
+    <dependency>
+      <groupId>iaik.win32</groupId>
+      <artifactId>Pkcs11Wrapper</artifactId>
+      <version>1.0</version>
+			<type>dll</type>
+      <scope>runtime</scope>
+    </dependency>
+	</dependencies>
+	
+  <build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+	        <configuration>
+	          <descriptors>
+	            <descriptor>${basedir}/assembly-war.xml</descriptor>
+	          </descriptors>
+	        </configuration>
+	        <executions>
+	          <execution>
+	            <id>make-assembly</id>
+	            <phase>package</phase>
+	            <goals>
+	              <goal>attached</goal>
+	            </goals>
+	          </execution>
+	        </executions>
+			</plugin>  
+		</plugins>  
+	</build>
+</project>
\ No newline at end of file
-- 
cgit v1.2.3


From 9b787d3409e629f292a98d0b5a0aad036b7421c7 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Fri, 17 Aug 2007 08:47:35 +0000
Subject: Improved and updated maven build process.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@919 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/auth/assembly-war.xml |  94 ------------------
 id/server/auth/assembly.xml     |   7 --
 id/server/auth/pom.xml          | 204 ++++++++++++----------------------------
 3 files changed, 61 insertions(+), 244 deletions(-)
 delete mode 100644 id/server/auth/assembly-war.xml
 delete mode 100644 id/server/auth/assembly.xml

(limited to 'id/server/auth')

diff --git a/id/server/auth/assembly-war.xml b/id/server/auth/assembly-war.xml
deleted file mode 100644
index 15f10f4cb..000000000
--- a/id/server/auth/assembly-war.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<assembly>
-  <id>web</id>
-
-  <formats>
-    <format>war</format>
-  </formats>
-
-	<includeBaseDirectory>false</includeBaseDirectory>
-
-	<fileSets>
-		<fileSet>
-			<directory>${basedir}/src/main/webapp</directory>
-			<outputDirectory>/</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../idserverlib/target/classes</directory>
-			<outputDirectory>WEB-INF/classes</outputDirectory>
-			<excludes>
-				<exclude>**/proxy/**</exclude>
-			</excludes>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/src/main/webapp</directory>
-			<outputDirectory>/</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../resources/wsdl</directory>
-			<outputDirectory>resources/schema</outputDirectory>
-			<excludes>
-				<exclude>**/*.wsdl</exclude>
-			</excludes>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../../../common/target</directory>
-			<outputDirectory>WEB-INF/lib</outputDirectory>
-			<includes>
-				<include>**/*.jar</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../../../spss/server/serverlib/target</directory>
-			<outputDirectory>WEB-INF/lib</outputDirectory>
-			<includes>
-				<include>**/*.jar</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../resources</directory>
-			<outputDirectory>WEB-INF/classes/resources</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../services</directory>
-			<outputDirectory>WEB-INF/classes/META-INF/services</outputDirectory>
-		</fileSet>
-	</fileSets>
-
-	<dependencySets>
-	<dependencySet>
-		<includes>
-			<include>javaext:activation</include>
-			<include>axis:axis</include>
-			<include>commons-discovery:commons-discovery</include>
-			<include>commons-fileupload:commons-fileupload</include>
-			<include>commons-io:commons-io</include>
-			<include>commons-logging:commons-logging</include>
-			<include>jaxp:dom</include>
-			<include>iaik.prod:iaik_ixsil</include>
-			<include>iaik.prod:iaik_moa_full</include>
-			<include>iaik.prod:iaik_Pkcs11Wrapper</include>
-			<include>iaik.prod:iaik_X509TrustManager</include>
-			<include>jaxen:jaxen-core</include>
-			<include>jaxen:jaxen-dom</include>
-			<include>jaxp:jaxp-api</include>
-			<include>javax.xml:jaxrpc</include>
-			<include>mail:mail</include>
-			<include>saaj:saaj</include>
-			<include>jaxp:sax</include>
-			<include>jaxen:saxpath</include>
-			<include>wsdl4j:wsdl4j</include>
-			<include>regexp:regexp</include>
-			<include>log4j:log4j</include>
-			<include>postgresql:postgresql</include>
-	</includes>
-		<outputDirectory>WEB-INF/lib</outputDirectory>
-	</dependencySet>
-	<dependencySet>
-		<includes>
-			<include>iaik.win32:Pkcs11Wrapper</include>
-	</includes>
-		<outputDirectory>WEB-INF/lib/win32</outputDirectory>
-	</dependencySet>
-	</dependencySets>
-
- </assembly>
\ No newline at end of file
diff --git a/id/server/auth/assembly.xml b/id/server/auth/assembly.xml
deleted file mode 100644
index 31709e6c5..000000000
--- a/id/server/auth/assembly.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<assembly>
-  <id>auth</id>
-  <formats>
-    <format>war</format>
-  </formats>
-
- </assembly>
\ No newline at end of file
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index d2adcedfc..405f6f390 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -1,144 +1,62 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-		<groupId>MOA.id</groupId>
-		<artifactId>server</artifactId>
-		<version>1.4.0</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>MOA.id.server</groupId>
-  <artifactId>auth</artifactId>
-  <packaging>pom</packaging>
-  <version>1.4.0</version>
-  <name>MOA Id Server Auth</name>
-
-	<dependencies>
-    <dependency>
-      <groupId>javaext</groupId>
-      <artifactId>activation</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>axis</groupId>
-      <artifactId>axis</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-discovery</groupId>
-      <artifactId>commons-discovery</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-	    <dependency>
-	      <groupId>commons-logging</groupId>
-	      <artifactId>commons-logging</artifactId>
-	    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>dom</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_ixsil</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_moa_full</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_Pkcs11Wrapper</artifactId>
-      <version>1.2.16</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_X509TrustManager</artifactId>
-    </dependency>
-	    <dependency>
-	      <groupId>jaxen</groupId>
-	      <artifactId>jaxen-core</artifactId>
-	    </dependency>
-	    <dependency>
-	      <groupId>jaxen</groupId>
-	      <artifactId>jaxen-dom</artifactId>
-	    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>jaxp-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>javax.xml</groupId>
-      <artifactId>jaxrpc-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>mail</groupId>
-      <artifactId>mail</artifactId>
-<!--      <version>1.5</version>-->
-    </dependency>
-    <dependency>
-      <groupId>saaj</groupId>
-      <artifactId>saaj</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>sax</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxen</groupId>
-      <artifactId>saxpath</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>wsdl4j</groupId>
-      <artifactId>wsdl4j</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>postgresql</groupId>
-      <artifactId>postgresql</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>regexp</groupId>
-      <artifactId>regexp</artifactId>
-    </dependency>
- 
-    <dependency>
-      <groupId>iaik.win32</groupId>
-      <artifactId>Pkcs11Wrapper</artifactId>
-      <version>1.0</version>
-			<type>dll</type>
-      <scope>runtime</scope>
-    </dependency>
-	</dependencies>
-	
-  <build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-	        <configuration>
-	          <descriptors>
-	            <descriptor>${basedir}/assembly-war.xml</descriptor>
-	          </descriptors>
-	        </configuration>
-	        <executions>
-	          <execution>
-	            <id>make-assembly</id>
-	            <phase>package</phase>
-	            <goals>
-	              <goal>attached</goal>
-	            </goals>
-	          </execution>
-	        </executions>
-			</plugin>  
-		</plugins>  
-	</build>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>MOA.id</groupId>
+        <artifactId>moa-id</artifactId>
+        <version>1.4.0</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>MOA.id.server</groupId>
+    <artifactId>moa-id-auth</artifactId>
+    <packaging>war</packaging>
+    <version>1.4.0</version>
+    <name>MOA ID-Auth WebService</name>
+
+    <properties>
+        <repositoryPath>${basedir}/../../../repository</repositoryPath>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.0.2</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                        </manifest>
+                    </archive>
+                    <webResources>
+                        <resource>
+                            <directory>${basedir}/../resources</directory>
+                            <targetPath>WEB-INF/classes/resources</targetPath>
+                        </resource>
+                        <resource>
+                            <directory>${basedir}/../services</directory>
+                            <targetPath>WEB-INF/classes/META-INF/services</targetPath>
+                        </resource>
+                    </webResources>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>MOA.spss.server</groupId>
+            <artifactId>moa-spss-lib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>MOA.id.server</groupId>
+            <artifactId>moa-id-lib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
 </project>
\ No newline at end of file
-- 
cgit v1.2.3


From ca610868fb50381d3829e6e7f9f7684e0d136eaf Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 22 Aug 2007 18:41:53 +0000
Subject: moved webservice specific files

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@932 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 ....apache.axis.components.net.SecureSocketFactory |   1 +
 .../WEB-INF/classes/resources/wsdl/MOA-ID-1.0.wsdl |  40 ++
 .../WEB-INF/classes/resources/wsdl/MOA-ID-1.x.wsdl |  40 ++
 .../classes/resources/wsdl/MOA-SPSS-1.2.xsd        | 454 +++++++++++++++++++++
 4 files changed, 535 insertions(+)
 create mode 100644 id/server/auth/src/main/webapp/WEB-INF/classes/META-INF/services/org.apache.axis.components.net.SecureSocketFactory
 create mode 100644 id/server/auth/src/main/webapp/WEB-INF/classes/resources/wsdl/MOA-ID-1.0.wsdl
 create mode 100644 id/server/auth/src/main/webapp/WEB-INF/classes/resources/wsdl/MOA-ID-1.x.wsdl
 create mode 100644 id/server/auth/src/main/webapp/WEB-INF/classes/resources/wsdl/MOA-SPSS-1.2.xsd

(limited to 'id/server/auth')

diff --git a/id/server/auth/src/main/webapp/WEB-INF/classes/META-INF/services/org.apache.axis.components.net.SecureSocketFactory b/id/server/auth/src/main/webapp/WEB-INF/classes/META-INF/services/org.apache.axis.components.net.SecureSocketFactory
new file mode 100644
index 000000000..c4547e804
--- /dev/null
+++ b/id/server/auth/src/main/webapp/WEB-INF/classes/META-INF/services/org.apache.axis.components.net.SecureSocketFactory
@@ -0,0 +1 @@
+at.gv.egovernment.moa.id.util.AxisSecureSocketFactory
diff --git a/id/server/auth/src/main/webapp/WEB-INF/classes/resources/wsdl/MOA-ID-1.0.wsdl b/id/server/auth/src/main/webapp/WEB-INF/classes/resources/wsdl/MOA-ID-1.0.wsdl
new file mode 100644
index 000000000..5751b3e58
--- /dev/null
+++ b/id/server/auth/src/main/webapp/WEB-INF/classes/resources/wsdl/MOA-ID-1.0.wsdl
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name="MOA" targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:xsd="http://www.w3.org/1999/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl/">
+	<import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" location="MOA-20020812.xsd"/>
+	<message name="GetAuthenticationDataInput">
+		<part name="body" element="samlp:Request"/>
+	</message>
+	<message name="GetAuthenticationDataOutput">
+		<part name="body" element="samlp:Response"/>
+	</message>
+	<message name="MOAFault">
+		<part name="body" element="moa:ErrorResponse"/>
+	</message>
+	<portType name="IdentificationPortType">
+		<operation name="getAuthenticationData">
+			<input message="tns:GetAuthenticationDataInput"/>
+			<output message="tns:GetAuthenticationDataOutput"/>
+			<fault name="MOAFault" message="tns:MOAFault"/>
+		</operation>
+	</portType>
+	<binding name="IdentificationBinding" type="tns:IdentificationPortType" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/soap/ http://schemas.xmlsoap.org/wsdl/soap/">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<operation name="getAuthenticationData">
+			<soap:operation soapAction="urn:GetAuthenticationDataAction"/>
+			<input>
+				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
+			</output>
+			<fault name="MOAFault">
+				<soap:fault name="MOAFault" use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
+			</fault>
+		</operation>
+	</binding>
+	<service name="GetAuthenticationDataService">
+		<port name="IdentificationPort" binding="tns:IdentificationBinding">
+			<soap:address location="http://localhost/moa-id-auth/services/GetAuthenticationData"/>
+		</port>
+	</service>
+</definitions>
diff --git a/id/server/auth/src/main/webapp/WEB-INF/classes/resources/wsdl/MOA-ID-1.x.wsdl b/id/server/auth/src/main/webapp/WEB-INF/classes/resources/wsdl/MOA-ID-1.x.wsdl
new file mode 100644
index 000000000..45152cb38
--- /dev/null
+++ b/id/server/auth/src/main/webapp/WEB-INF/classes/resources/wsdl/MOA-ID-1.x.wsdl
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name="MOA" targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:xsd="http://www.w3.org/1999/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl/">
+	<import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" location="../resources/schemas/MOA-SPSS-1.2.xsd"/>
+	<message name="GetAuthenticationDataInput">
+		<part name="body" element="samlp:Request"/>
+	</message>
+	<message name="GetAuthenticationDataOutput">
+		<part name="body" element="samlp:Response"/>
+	</message>
+	<message name="MOAFault">
+		<part name="body" element="moa:ErrorResponse"/>
+	</message>
+	<portType name="IdentificationPortType">
+		<operation name="getAuthenticationData">
+			<input message="tns:GetAuthenticationDataInput"/>
+			<output message="tns:GetAuthenticationDataOutput"/>
+			<fault name="MOAFault" message="tns:MOAFault"/>
+		</operation>
+	</portType>
+	<binding name="IdentificationBinding" type="tns:IdentificationPortType" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/soap/ http://schemas.xmlsoap.org/wsdl/soap/">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<operation name="getAuthenticationData">
+			<soap:operation soapAction="urn:GetAuthenticationDataAction"/>
+			<input>
+				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
+			</output>
+			<fault name="MOAFault">
+				<soap:fault name="MOAFault" use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
+			</fault>
+		</operation>
+	</binding>
+	<service name="GetAuthenticationDataService">
+		<port name="IdentificationPort" binding="tns:IdentificationBinding">
+			<soap:address location="http://localhost/Identification"/>
+		</port>
+	</service>
+</definitions>
diff --git a/id/server/auth/src/main/webapp/WEB-INF/classes/resources/wsdl/MOA-SPSS-1.2.xsd b/id/server/auth/src/main/webapp/WEB-INF/classes/resources/wsdl/MOA-SPSS-1.2.xsd
new file mode 100644
index 000000000..d7a06d6e7
--- /dev/null
+++ b/id/server/auth/src/main/webapp/WEB-INF/classes/resources/wsdl/MOA-SPSS-1.2.xsd
@@ -0,0 +1,454 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  MOA SP/SS 1.2 Schema
+-->
+<xsd:schema targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.2">
+  <xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
+  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+  <!--########## Create XML Signature ###-->
+  <!--### Create XML Signature Request ###-->
+  <xsd:element name="CreateXMLSignatureRequest">
+    <xsd:complexType>
+      <xsd:complexContent>
+        <xsd:extension base="CreateXMLSignatureRequestType"/>
+      </xsd:complexContent>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:complexType name="CreateXMLSignatureRequestType">
+    <xsd:sequence>
+      <xsd:element name="KeyIdentifier" type="KeyIdentifierType"/>
+      <xsd:element name="SingleSignatureInfo" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>Ermöglichung der Stapelsignatur durch wiederholte Angabe dieses Elements</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="DataObjectInfo" maxOccurs="unbounded">
+              <xsd:complexType>
+                <xsd:complexContent>
+                  <xsd:extension base="DataObjectInfoType">
+                    <xsd:attribute name="ChildOfManifest" type="xsd:boolean" use="optional" default="false"/>
+                  </xsd:extension>
+                </xsd:complexContent>
+              </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="CreateSignatureInfo" minOccurs="0">
+              <xsd:complexType>
+                <xsd:sequence>
+                  <xsd:element name="CreateSignatureEnvironment" type="ContentOptionalRefType"/>
+                  <xsd:choice>
+                    <xsd:annotation>
+                      <xsd:documentation>Auswahl: Entweder explizite Angabe des Signaturorts sowie ggf. sinnvoller Supplements im Zshg. mit der Signaturumgebung, oder Verweis auf ein benanntes Profil</xsd:documentation>
+                    </xsd:annotation>
+                    <xsd:element ref="CreateSignatureEnvironmentProfile"/>
+                    <xsd:element name="CreateSignatureEnvironmentProfileID" type="ProfileIdentifierType"/>
+                  </xsd:choice>
+                </xsd:sequence>
+              </xsd:complexType>
+            </xsd:element>
+          </xsd:sequence>
+          <xsd:attribute name="SecurityLayerConformity" type="xsd:boolean" use="optional" default="true"/>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+  <!--### Create XML Signature Response ###-->
+  <xsd:complexType name="CreateXMLSignatureResponseType">
+    <xsd:choice maxOccurs="unbounded">
+      <xsd:annotation>
+        <xsd:documentation>Kardinalität 1..oo erlaubt die Antwort auf eine Stapelsignatur-Anfrage</xsd:documentation>
+      </xsd:annotation>
+      <xsd:element name="SignatureEnvironment">
+        <xsd:annotation>
+          <xsd:documentation>Resultat, falls die Signaturerstellung erfolgreich war</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:any namespace="##any" processContents="lax"/>
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element ref="ErrorResponse"/>
+    </xsd:choice>
+  </xsd:complexType>
+  <xsd:element name="CreateXMLSignatureResponse" type="CreateXMLSignatureResponseType"/>
+  <!--########## Verify CMS Signature ###-->
+  <!--### Verifiy CMS Signature Request ###-->
+  <xsd:element name="VerifyCMSSignatureRequest">
+    <xsd:complexType>
+      <xsd:complexContent>
+        <xsd:extension base="VerifyCMSSignatureRequestType">
+          <xsd:attribute name="Signatories" type="SignatoriesType" use="optional" default="1"/>
+        </xsd:extension>
+      </xsd:complexContent>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:complexType name="VerifyCMSSignatureRequestType">
+    <xsd:sequence>
+      <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
+      <xsd:element name="CMSSignature" type="xsd:base64Binary"/>
+      <xsd:element name="DataObject" type="CMSDataObjectOptionalMetaType" minOccurs="0"/>
+      <xsd:element name="TrustProfileID">
+        <xsd:annotation>
+          <xsd:documentation>mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+  <!--### Verify CMS Signature Response ###-->
+  <xsd:element name="VerifyCMSSignatureResponse" type="VerifyCMSSignatureResponseType"/>
+  <xsd:complexType name="VerifyCMSSignatureResponseType">
+    <xsd:sequence maxOccurs="unbounded">
+      <xsd:element name="SignerInfo" type="dsig:KeyInfoType">
+        <xsd:annotation>
+          <xsd:documentation>only ds:X509Data and RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any;publicAuthority is included as X509Data/any</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="SignatureCheck" type="CheckResultType"/>
+      <xsd:element name="CertificateCheck" type="CheckResultType"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <!--########## Verify XML Signature ###-->
+  <!--### Verify XML Signature Request ###-->
+  <xsd:element name="VerifyXMLSignatureRequest" type="VerifyXMLSignatureRequestType"/>
+  <xsd:complexType name="VerifyXMLSignatureRequestType">
+    <xsd:sequence>
+      <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
+      <xsd:element name="VerifySignatureInfo">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="VerifySignatureEnvironment" type="ContentOptionalRefType"/>
+            <xsd:element name="VerifySignatureLocation" type="xsd:token"/>
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:choice minOccurs="0" maxOccurs="unbounded">
+        <xsd:element ref="SupplementProfile"/>
+        <xsd:element name="SupplementProfileID" type="xsd:string"/>
+      </xsd:choice>
+      <xsd:element name="SignatureManifestCheckParams" minOccurs="0">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="ReferenceInfo" type="VerifyTransformsDataType" maxOccurs="unbounded">
+              <xsd:annotation>
+                <xsd:documentation>Pro dsig:Reference-Element in der zu überprüfenden XML-Signatur muss hier ein ReferenceInfo-Element erscheinen. Die Reihenfolge der einzelnen ReferenceInfo Elemente entspricht jener der dsig:Reference Elemente in der XML-Signatur.</xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+          </xsd:sequence>
+          <xsd:attribute name="ReturnReferenceInputData" type="xsd:boolean" use="optional" default="true"/>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="ReturnHashInputData" minOccurs="0"/>
+      <xsd:element name="TrustProfileID">
+        <xsd:annotation>
+          <xsd:documentation>mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+  <!--### Verify XML Signature Response ###-->
+  <xsd:element name="VerifyXMLSignatureResponse" type="VerifyXMLSignatureResponseType"/>
+  <xsd:complexType name="VerifyXMLSignatureResponseType">
+    <xsd:sequence>
+      <xsd:element name="SignerInfo" type="dsig:KeyInfoType">
+        <xsd:annotation>
+          <xsd:documentation>only ds:X509Data and ds:RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any; PublicAuthority is included as X509Data/any</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="HashInputData" type="ContentExLocRefBaseType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="ReferenceInputData" type="ContentExLocRefBaseType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="SignatureCheck" type="ReferencesCheckResultType"/>
+      <xsd:element name="SignatureManifestCheck" type="ReferencesCheckResultType" minOccurs="0"/>
+      <xsd:element name="XMLDSIGManifestCheck" type="ManifestRefsCheckResultType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="CertificateCheck" type="CheckResultType"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:simpleType name="ProfileIdentifierType">
+    <xsd:restriction base="xsd:token"/>
+  </xsd:simpleType>
+  <xsd:complexType name="MetaInfoType">
+    <xsd:sequence>
+      <xsd:element name="MimeType" type="MimeTypeType"/>
+      <xsd:element name="Description" type="xsd:anyURI" minOccurs="0"/>
+      <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="FinalDataMetaInfoType">
+    <xsd:complexContent>
+      <xsd:extension base="MetaInfoType">
+        <xsd:sequence>
+          <xsd:element name="Type" type="xsd:anyURI" minOccurs="0"/>
+        </xsd:sequence>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="DataObjectInfoType">
+    <xsd:sequence>
+      <xsd:element name="DataObject">
+        <xsd:complexType>
+          <xsd:complexContent>
+            <xsd:extension base="ContentOptionalRefType"/>
+          </xsd:complexContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:choice>
+        <xsd:annotation>
+          <xsd:documentation>Auswahl: Entweder explizite Angabe EINER Transformationskette inklusive ggf. sinnvoller Supplements oder Verweis auf ein benanntes Profil</xsd:documentation>
+        </xsd:annotation>
+        <xsd:element ref="CreateTransformsInfoProfile"/>
+        <xsd:element name="CreateTransformsInfoProfileID" type="ProfileIdentifierType"/>
+      </xsd:choice>
+    </xsd:sequence>
+    <xsd:attribute name="Structure" use="required">
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="detached"/>
+          <xsd:enumeration value="enveloping"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="TransformsInfoType">
+    <xsd:sequence>
+      <xsd:element ref="dsig:Transforms" minOccurs="0"/>
+      <xsd:element name="FinalDataMetaInfo" type="FinalDataMetaInfoType"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="XMLDataObjectAssociationType">
+    <xsd:sequence>
+      <xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>
+      <xsd:element name="Content" type="ContentRequiredRefType"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="CMSDataObjectOptionalMetaType">
+    <xsd:sequence>
+      <xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>
+      <xsd:element name="Content" type="CMSContentBaseType"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="CMSContentBaseType">
+    <xsd:complexContent>
+      <xsd:restriction base="ContentOptionalRefType">
+        <xsd:choice minOccurs="0">
+          <xsd:element name="Base64Content" type="xsd:base64Binary"/>
+        </xsd:choice>
+      </xsd:restriction>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="CheckResultType">
+    <xsd:sequence>
+      <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
+      <xsd:element name="Info" type="AnyChildrenType" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="ReferencesCheckResultType">
+    <xsd:complexContent>
+      <xsd:restriction base="CheckResultType">
+        <xsd:sequence>
+          <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
+          <xsd:element name="Info" type="ReferencesCheckResultInfoType" minOccurs="0"/>
+        </xsd:sequence>
+      </xsd:restriction>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="ReferencesCheckResultInfoType" mixed="true">
+    <xsd:complexContent mixed="true">
+      <xsd:restriction base="AnyChildrenType">
+        <xsd:sequence>
+          <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+          <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+      </xsd:restriction>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="ManifestRefsCheckResultType">
+    <xsd:complexContent>
+      <xsd:restriction base="CheckResultType">
+        <xsd:sequence>
+          <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
+          <xsd:element name="Info" type="ManifestRefsCheckResultInfoType"/>
+        </xsd:sequence>
+      </xsd:restriction>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="ManifestRefsCheckResultInfoType" mixed="true">
+    <xsd:complexContent mixed="true">
+      <xsd:restriction base="AnyChildrenType">
+        <xsd:sequence>
+          <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+          <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>
+          <xsd:element name="ReferringSigReference" type="xsd:positiveInteger"/>
+        </xsd:sequence>
+      </xsd:restriction>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <!--########## Error Response ###-->
+  <xsd:element name="ErrorResponse" type="ErrorResponseType">
+    <xsd:annotation>
+      <xsd:documentation>Resultat, falls die Signaturerstellung gescheitert ist</xsd:documentation>
+    </xsd:annotation>
+  </xsd:element>
+  <xsd:complexType name="ErrorResponseType">
+    <xsd:sequence>
+      <xsd:element name="ErrorCode" type="xsd:integer"/>
+      <xsd:element name="Info" type="xsd:string"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <!--########## Auxiliary Types ###-->
+  <xsd:simpleType name="KeyIdentifierType">
+    <xsd:restriction base="xsd:string"/>
+  </xsd:simpleType>
+  <xsd:simpleType name="KeyStorageType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="Software"/>
+      <xsd:enumeration value="Hardware"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="MimeTypeType">
+    <xsd:restriction base="xsd:token"/>
+  </xsd:simpleType>
+  <xsd:complexType name="AnyChildrenType" mixed="true">
+    <xsd:sequence>
+      <xsd:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="XMLContentType" mixed="true">
+    <xsd:complexContent mixed="true">
+      <xsd:extension base="AnyChildrenType">
+        <xsd:attribute ref="xml:space" use="optional"/>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="ContentBaseType">
+    <xsd:choice minOccurs="0">
+      <xsd:element name="Base64Content" type="xsd:base64Binary"/>
+      <xsd:element name="XMLContent" type="XMLContentType"/>
+      <xsd:element name="LocRefContent" type="xsd:anyURI"/>
+    </xsd:choice>
+  </xsd:complexType>
+  <xsd:complexType name="ContentExLocRefBaseType">
+    <xsd:complexContent>
+      <xsd:restriction base="ContentBaseType">
+        <xsd:choice minOccurs="0">
+          <xsd:element name="Base64Content" type="xsd:base64Binary"/>
+          <xsd:element name="XMLContent" type="XMLContentType"/>
+        </xsd:choice>
+      </xsd:restriction>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="ContentOptionalRefType">
+    <xsd:complexContent>
+      <xsd:extension base="ContentBaseType">
+        <xsd:attribute name="Reference" type="xsd:anyURI" use="optional"/>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="ContentRequiredRefType">
+    <xsd:complexContent>
+      <xsd:restriction base="ContentOptionalRefType">
+        <xsd:choice minOccurs="0">
+          <xsd:element name="Base64Content" type="xsd:base64Binary"/>
+          <xsd:element name="XMLContent" type="XMLContentType"/>
+          <xsd:element name="LocRefContent" type="xsd:anyURI"/>
+        </xsd:choice>
+        <xsd:attribute name="Reference" type="xsd:anyURI" use="required"/>
+      </xsd:restriction>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="VerifyTransformsDataType">
+    <xsd:choice maxOccurs="unbounded">
+      <xsd:annotation>
+        <xsd:documentation>Ein oder mehrere Transformationswege können von der Applikation an MOA mitgeteilt werden. Die zu prüfende Signatur hat zumindest einem dieser Transformationswege zu entsprechen. Die Angabe kann explizit oder als Profilbezeichner erfolgen.</xsd:documentation>
+      </xsd:annotation>
+      <xsd:element ref="VerifyTransformsInfoProfile"/>
+      <xsd:element name="VerifyTransformsInfoProfileID" type="xsd:string">
+        <xsd:annotation>
+          <xsd:documentation>Profilbezeichner für einen Transformationsweg</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+    </xsd:choice>
+  </xsd:complexType>
+  <xsd:element name="QualifiedCertificate"/>
+  <xsd:element name="PublicAuthority" type="PublicAuthorityType"/>
+  <xsd:complexType name="PublicAuthorityType">
+    <xsd:sequence>
+      <xsd:element name="Code" type="xsd:string" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:simpleType name="SignatoriesType">
+    <xsd:union memberTypes="AllSignatoriesType">
+      <xsd:simpleType>
+        <xsd:list itemType="xsd:positiveInteger"/>
+      </xsd:simpleType>
+    </xsd:union>
+  </xsd:simpleType>
+  <xsd:simpleType name="AllSignatoriesType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="all"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:complexType name="CreateSignatureLocationType">
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:token">
+        <xsd:attribute name="Index" type="xsd:nonNegativeInteger" use="required"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="TransformParameterType">
+    <xsd:choice minOccurs="0">
+      <xsd:annotation>
+        <xsd:documentation>Die Angabe des Transformationsparameters (explizit oder als Hashwert) kann unterlassen werden, wenn die Applikation von der Unveränderlichkeit des Inhalts der in "Transformationsparamter", Attribut "URI" angegebenen URI ausgehen kann.</xsd:documentation>
+      </xsd:annotation>
+      <xsd:element name="Base64Content" type="xsd:base64Binary">
+        <xsd:annotation>
+          <xsd:documentation>Der Transformationsparameter explizit angegeben.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="Hash">
+        <xsd:annotation>
+          <xsd:documentation>Der Hashwert des Transformationsparameters.</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element ref="dsig:DigestMethod"/>
+            <xsd:element ref="dsig:DigestValue"/>
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:choice>
+    <xsd:attribute name="URI" type="xsd:anyURI" use="required"/>
+  </xsd:complexType>
+  <xsd:element name="CreateSignatureEnvironmentProfile">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="CreateSignatureLocation" type="CreateSignatureLocationType"/>
+        <xsd:element name="Supplement" type="XMLDataObjectAssociationType" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:element name="VerifyTransformsInfoProfile">
+    <xsd:annotation>
+      <xsd:documentation>Explizite Angabe des Transformationswegs</xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element ref="dsig:Transforms" minOccurs="0"/>
+        <xsd:element name="TransformParameter" type="TransformParameterType" minOccurs="0" maxOccurs="unbounded">
+          <xsd:annotation>
+            <xsd:documentation>Alle impliziten Transformationsparameter, die zum Durchlaufen der oben angeführten Transformationskette bekannt sein müssen, müssen hier angeführt werden. Das Attribut "URI" bezeichnet den Transformationsparameter in exakt jener Weise, wie er in der zu überprüfenden Signatur gebraucht wird.</xsd:documentation>
+          </xsd:annotation>
+        </xsd:element>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:element name="Supplement" type="XMLDataObjectAssociationType"/>
+  <xsd:element name="SupplementProfile" type="XMLDataObjectAssociationType"/>
+  <xsd:element name="CreateTransformsInfoProfile">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="CreateTransformsInfo" type="TransformsInfoType"/>
+        <xsd:element ref="Supplement" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+</xsd:schema>
-- 
cgit v1.2.3


From 7537351b14d0738d9e16bef4fad8380c3a0b0f21 Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 22 Aug 2007 18:54:53 +0000
Subject: minor build fixes/improvements

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@934 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/auth/pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 405f6f390..8dd93220b 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -31,6 +31,7 @@
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                         </manifest>
                     </archive>
+<!--
                     <webResources>
                         <resource>
                             <directory>${basedir}/../resources</directory>
@@ -41,6 +42,7 @@
                             <targetPath>WEB-INF/classes/META-INF/services</targetPath>
                         </resource>
                     </webResources>
+-->                    
                 </configuration>
             </plugin>
         </plugins>
@@ -59,4 +61,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
-- 
cgit v1.2.3


From 6330e90d2c17af78aa1b4c4c44d44f45867ee57b Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Thu, 23 Aug 2007 07:10:34 +0000
Subject: Moved war resources of id/server/auth to the proper location.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@935 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 ....apache.axis.components.net.SecureSocketFactory |   1 +
 .../main/resources/resources/wsdl/MOA-ID-1.0.wsdl  |  40 ++
 .../main/resources/resources/wsdl/MOA-ID-1.x.wsdl  |  40 ++
 .../main/resources/resources/wsdl/MOA-SPSS-1.2.xsd | 454 +++++++++++++++++++++
 ....apache.axis.components.net.SecureSocketFactory |   1 -
 .../WEB-INF/classes/resources/wsdl/MOA-ID-1.0.wsdl |  40 --
 .../WEB-INF/classes/resources/wsdl/MOA-ID-1.x.wsdl |  40 --
 .../classes/resources/wsdl/MOA-SPSS-1.2.xsd        | 454 ---------------------
 8 files changed, 535 insertions(+), 535 deletions(-)
 create mode 100644 id/server/auth/src/main/resources/META-INF/services/org.apache.axis.components.net.SecureSocketFactory
 create mode 100644 id/server/auth/src/main/resources/resources/wsdl/MOA-ID-1.0.wsdl
 create mode 100644 id/server/auth/src/main/resources/resources/wsdl/MOA-ID-1.x.wsdl
 create mode 100644 id/server/auth/src/main/resources/resources/wsdl/MOA-SPSS-1.2.xsd
 delete mode 100644 id/server/auth/src/main/webapp/WEB-INF/classes/META-INF/services/org.apache.axis.components.net.SecureSocketFactory
 delete mode 100644 id/server/auth/src/main/webapp/WEB-INF/classes/resources/wsdl/MOA-ID-1.0.wsdl
 delete mode 100644 id/server/auth/src/main/webapp/WEB-INF/classes/resources/wsdl/MOA-ID-1.x.wsdl
 delete mode 100644 id/server/auth/src/main/webapp/WEB-INF/classes/resources/wsdl/MOA-SPSS-1.2.xsd

(limited to 'id/server/auth')

diff --git a/id/server/auth/src/main/resources/META-INF/services/org.apache.axis.components.net.SecureSocketFactory b/id/server/auth/src/main/resources/META-INF/services/org.apache.axis.components.net.SecureSocketFactory
new file mode 100644
index 000000000..c4547e804
--- /dev/null
+++ b/id/server/auth/src/main/resources/META-INF/services/org.apache.axis.components.net.SecureSocketFactory
@@ -0,0 +1 @@
+at.gv.egovernment.moa.id.util.AxisSecureSocketFactory
diff --git a/id/server/auth/src/main/resources/resources/wsdl/MOA-ID-1.0.wsdl b/id/server/auth/src/main/resources/resources/wsdl/MOA-ID-1.0.wsdl
new file mode 100644
index 000000000..5751b3e58
--- /dev/null
+++ b/id/server/auth/src/main/resources/resources/wsdl/MOA-ID-1.0.wsdl
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name="MOA" targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:xsd="http://www.w3.org/1999/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl/">
+	<import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" location="MOA-20020812.xsd"/>
+	<message name="GetAuthenticationDataInput">
+		<part name="body" element="samlp:Request"/>
+	</message>
+	<message name="GetAuthenticationDataOutput">
+		<part name="body" element="samlp:Response"/>
+	</message>
+	<message name="MOAFault">
+		<part name="body" element="moa:ErrorResponse"/>
+	</message>
+	<portType name="IdentificationPortType">
+		<operation name="getAuthenticationData">
+			<input message="tns:GetAuthenticationDataInput"/>
+			<output message="tns:GetAuthenticationDataOutput"/>
+			<fault name="MOAFault" message="tns:MOAFault"/>
+		</operation>
+	</portType>
+	<binding name="IdentificationBinding" type="tns:IdentificationPortType" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/soap/ http://schemas.xmlsoap.org/wsdl/soap/">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<operation name="getAuthenticationData">
+			<soap:operation soapAction="urn:GetAuthenticationDataAction"/>
+			<input>
+				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
+			</output>
+			<fault name="MOAFault">
+				<soap:fault name="MOAFault" use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
+			</fault>
+		</operation>
+	</binding>
+	<service name="GetAuthenticationDataService">
+		<port name="IdentificationPort" binding="tns:IdentificationBinding">
+			<soap:address location="http://localhost/moa-id-auth/services/GetAuthenticationData"/>
+		</port>
+	</service>
+</definitions>
diff --git a/id/server/auth/src/main/resources/resources/wsdl/MOA-ID-1.x.wsdl b/id/server/auth/src/main/resources/resources/wsdl/MOA-ID-1.x.wsdl
new file mode 100644
index 000000000..45152cb38
--- /dev/null
+++ b/id/server/auth/src/main/resources/resources/wsdl/MOA-ID-1.x.wsdl
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name="MOA" targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:xsd="http://www.w3.org/1999/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl/">
+	<import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" location="../resources/schemas/MOA-SPSS-1.2.xsd"/>
+	<message name="GetAuthenticationDataInput">
+		<part name="body" element="samlp:Request"/>
+	</message>
+	<message name="GetAuthenticationDataOutput">
+		<part name="body" element="samlp:Response"/>
+	</message>
+	<message name="MOAFault">
+		<part name="body" element="moa:ErrorResponse"/>
+	</message>
+	<portType name="IdentificationPortType">
+		<operation name="getAuthenticationData">
+			<input message="tns:GetAuthenticationDataInput"/>
+			<output message="tns:GetAuthenticationDataOutput"/>
+			<fault name="MOAFault" message="tns:MOAFault"/>
+		</operation>
+	</portType>
+	<binding name="IdentificationBinding" type="tns:IdentificationPortType" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/soap/ http://schemas.xmlsoap.org/wsdl/soap/">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<operation name="getAuthenticationData">
+			<soap:operation soapAction="urn:GetAuthenticationDataAction"/>
+			<input>
+				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
+			</output>
+			<fault name="MOAFault">
+				<soap:fault name="MOAFault" use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
+			</fault>
+		</operation>
+	</binding>
+	<service name="GetAuthenticationDataService">
+		<port name="IdentificationPort" binding="tns:IdentificationBinding">
+			<soap:address location="http://localhost/Identification"/>
+		</port>
+	</service>
+</definitions>
diff --git a/id/server/auth/src/main/resources/resources/wsdl/MOA-SPSS-1.2.xsd b/id/server/auth/src/main/resources/resources/wsdl/MOA-SPSS-1.2.xsd
new file mode 100644
index 000000000..d7a06d6e7
--- /dev/null
+++ b/id/server/auth/src/main/resources/resources/wsdl/MOA-SPSS-1.2.xsd
@@ -0,0 +1,454 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  MOA SP/SS 1.2 Schema
+-->
+<xsd:schema targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.2">
+  <xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
+  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+  <!--########## Create XML Signature ###-->
+  <!--### Create XML Signature Request ###-->
+  <xsd:element name="CreateXMLSignatureRequest">
+    <xsd:complexType>
+      <xsd:complexContent>
+        <xsd:extension base="CreateXMLSignatureRequestType"/>
+      </xsd:complexContent>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:complexType name="CreateXMLSignatureRequestType">
+    <xsd:sequence>
+      <xsd:element name="KeyIdentifier" type="KeyIdentifierType"/>
+      <xsd:element name="SingleSignatureInfo" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>Ermöglichung der Stapelsignatur durch wiederholte Angabe dieses Elements</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="DataObjectInfo" maxOccurs="unbounded">
+              <xsd:complexType>
+                <xsd:complexContent>
+                  <xsd:extension base="DataObjectInfoType">
+                    <xsd:attribute name="ChildOfManifest" type="xsd:boolean" use="optional" default="false"/>
+                  </xsd:extension>
+                </xsd:complexContent>
+              </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="CreateSignatureInfo" minOccurs="0">
+              <xsd:complexType>
+                <xsd:sequence>
+                  <xsd:element name="CreateSignatureEnvironment" type="ContentOptionalRefType"/>
+                  <xsd:choice>
+                    <xsd:annotation>
+                      <xsd:documentation>Auswahl: Entweder explizite Angabe des Signaturorts sowie ggf. sinnvoller Supplements im Zshg. mit der Signaturumgebung, oder Verweis auf ein benanntes Profil</xsd:documentation>
+                    </xsd:annotation>
+                    <xsd:element ref="CreateSignatureEnvironmentProfile"/>
+                    <xsd:element name="CreateSignatureEnvironmentProfileID" type="ProfileIdentifierType"/>
+                  </xsd:choice>
+                </xsd:sequence>
+              </xsd:complexType>
+            </xsd:element>
+          </xsd:sequence>
+          <xsd:attribute name="SecurityLayerConformity" type="xsd:boolean" use="optional" default="true"/>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+  <!--### Create XML Signature Response ###-->
+  <xsd:complexType name="CreateXMLSignatureResponseType">
+    <xsd:choice maxOccurs="unbounded">
+      <xsd:annotation>
+        <xsd:documentation>Kardinalität 1..oo erlaubt die Antwort auf eine Stapelsignatur-Anfrage</xsd:documentation>
+      </xsd:annotation>
+      <xsd:element name="SignatureEnvironment">
+        <xsd:annotation>
+          <xsd:documentation>Resultat, falls die Signaturerstellung erfolgreich war</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:any namespace="##any" processContents="lax"/>
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element ref="ErrorResponse"/>
+    </xsd:choice>
+  </xsd:complexType>
+  <xsd:element name="CreateXMLSignatureResponse" type="CreateXMLSignatureResponseType"/>
+  <!--########## Verify CMS Signature ###-->
+  <!--### Verifiy CMS Signature Request ###-->
+  <xsd:element name="VerifyCMSSignatureRequest">
+    <xsd:complexType>
+      <xsd:complexContent>
+        <xsd:extension base="VerifyCMSSignatureRequestType">
+          <xsd:attribute name="Signatories" type="SignatoriesType" use="optional" default="1"/>
+        </xsd:extension>
+      </xsd:complexContent>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:complexType name="VerifyCMSSignatureRequestType">
+    <xsd:sequence>
+      <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
+      <xsd:element name="CMSSignature" type="xsd:base64Binary"/>
+      <xsd:element name="DataObject" type="CMSDataObjectOptionalMetaType" minOccurs="0"/>
+      <xsd:element name="TrustProfileID">
+        <xsd:annotation>
+          <xsd:documentation>mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+  <!--### Verify CMS Signature Response ###-->
+  <xsd:element name="VerifyCMSSignatureResponse" type="VerifyCMSSignatureResponseType"/>
+  <xsd:complexType name="VerifyCMSSignatureResponseType">
+    <xsd:sequence maxOccurs="unbounded">
+      <xsd:element name="SignerInfo" type="dsig:KeyInfoType">
+        <xsd:annotation>
+          <xsd:documentation>only ds:X509Data and RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any;publicAuthority is included as X509Data/any</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="SignatureCheck" type="CheckResultType"/>
+      <xsd:element name="CertificateCheck" type="CheckResultType"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <!--########## Verify XML Signature ###-->
+  <!--### Verify XML Signature Request ###-->
+  <xsd:element name="VerifyXMLSignatureRequest" type="VerifyXMLSignatureRequestType"/>
+  <xsd:complexType name="VerifyXMLSignatureRequestType">
+    <xsd:sequence>
+      <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
+      <xsd:element name="VerifySignatureInfo">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="VerifySignatureEnvironment" type="ContentOptionalRefType"/>
+            <xsd:element name="VerifySignatureLocation" type="xsd:token"/>
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:choice minOccurs="0" maxOccurs="unbounded">
+        <xsd:element ref="SupplementProfile"/>
+        <xsd:element name="SupplementProfileID" type="xsd:string"/>
+      </xsd:choice>
+      <xsd:element name="SignatureManifestCheckParams" minOccurs="0">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="ReferenceInfo" type="VerifyTransformsDataType" maxOccurs="unbounded">
+              <xsd:annotation>
+                <xsd:documentation>Pro dsig:Reference-Element in der zu überprüfenden XML-Signatur muss hier ein ReferenceInfo-Element erscheinen. Die Reihenfolge der einzelnen ReferenceInfo Elemente entspricht jener der dsig:Reference Elemente in der XML-Signatur.</xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+          </xsd:sequence>
+          <xsd:attribute name="ReturnReferenceInputData" type="xsd:boolean" use="optional" default="true"/>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="ReturnHashInputData" minOccurs="0"/>
+      <xsd:element name="TrustProfileID">
+        <xsd:annotation>
+          <xsd:documentation>mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+  <!--### Verify XML Signature Response ###-->
+  <xsd:element name="VerifyXMLSignatureResponse" type="VerifyXMLSignatureResponseType"/>
+  <xsd:complexType name="VerifyXMLSignatureResponseType">
+    <xsd:sequence>
+      <xsd:element name="SignerInfo" type="dsig:KeyInfoType">
+        <xsd:annotation>
+          <xsd:documentation>only ds:X509Data and ds:RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any; PublicAuthority is included as X509Data/any</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="HashInputData" type="ContentExLocRefBaseType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="ReferenceInputData" type="ContentExLocRefBaseType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="SignatureCheck" type="ReferencesCheckResultType"/>
+      <xsd:element name="SignatureManifestCheck" type="ReferencesCheckResultType" minOccurs="0"/>
+      <xsd:element name="XMLDSIGManifestCheck" type="ManifestRefsCheckResultType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="CertificateCheck" type="CheckResultType"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:simpleType name="ProfileIdentifierType">
+    <xsd:restriction base="xsd:token"/>
+  </xsd:simpleType>
+  <xsd:complexType name="MetaInfoType">
+    <xsd:sequence>
+      <xsd:element name="MimeType" type="MimeTypeType"/>
+      <xsd:element name="Description" type="xsd:anyURI" minOccurs="0"/>
+      <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="FinalDataMetaInfoType">
+    <xsd:complexContent>
+      <xsd:extension base="MetaInfoType">
+        <xsd:sequence>
+          <xsd:element name="Type" type="xsd:anyURI" minOccurs="0"/>
+        </xsd:sequence>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="DataObjectInfoType">
+    <xsd:sequence>
+      <xsd:element name="DataObject">
+        <xsd:complexType>
+          <xsd:complexContent>
+            <xsd:extension base="ContentOptionalRefType"/>
+          </xsd:complexContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:choice>
+        <xsd:annotation>
+          <xsd:documentation>Auswahl: Entweder explizite Angabe EINER Transformationskette inklusive ggf. sinnvoller Supplements oder Verweis auf ein benanntes Profil</xsd:documentation>
+        </xsd:annotation>
+        <xsd:element ref="CreateTransformsInfoProfile"/>
+        <xsd:element name="CreateTransformsInfoProfileID" type="ProfileIdentifierType"/>
+      </xsd:choice>
+    </xsd:sequence>
+    <xsd:attribute name="Structure" use="required">
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="detached"/>
+          <xsd:enumeration value="enveloping"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="TransformsInfoType">
+    <xsd:sequence>
+      <xsd:element ref="dsig:Transforms" minOccurs="0"/>
+      <xsd:element name="FinalDataMetaInfo" type="FinalDataMetaInfoType"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="XMLDataObjectAssociationType">
+    <xsd:sequence>
+      <xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>
+      <xsd:element name="Content" type="ContentRequiredRefType"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="CMSDataObjectOptionalMetaType">
+    <xsd:sequence>
+      <xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>
+      <xsd:element name="Content" type="CMSContentBaseType"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="CMSContentBaseType">
+    <xsd:complexContent>
+      <xsd:restriction base="ContentOptionalRefType">
+        <xsd:choice minOccurs="0">
+          <xsd:element name="Base64Content" type="xsd:base64Binary"/>
+        </xsd:choice>
+      </xsd:restriction>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="CheckResultType">
+    <xsd:sequence>
+      <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
+      <xsd:element name="Info" type="AnyChildrenType" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="ReferencesCheckResultType">
+    <xsd:complexContent>
+      <xsd:restriction base="CheckResultType">
+        <xsd:sequence>
+          <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
+          <xsd:element name="Info" type="ReferencesCheckResultInfoType" minOccurs="0"/>
+        </xsd:sequence>
+      </xsd:restriction>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="ReferencesCheckResultInfoType" mixed="true">
+    <xsd:complexContent mixed="true">
+      <xsd:restriction base="AnyChildrenType">
+        <xsd:sequence>
+          <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+          <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+      </xsd:restriction>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="ManifestRefsCheckResultType">
+    <xsd:complexContent>
+      <xsd:restriction base="CheckResultType">
+        <xsd:sequence>
+          <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
+          <xsd:element name="Info" type="ManifestRefsCheckResultInfoType"/>
+        </xsd:sequence>
+      </xsd:restriction>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="ManifestRefsCheckResultInfoType" mixed="true">
+    <xsd:complexContent mixed="true">
+      <xsd:restriction base="AnyChildrenType">
+        <xsd:sequence>
+          <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+          <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>
+          <xsd:element name="ReferringSigReference" type="xsd:positiveInteger"/>
+        </xsd:sequence>
+      </xsd:restriction>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <!--########## Error Response ###-->
+  <xsd:element name="ErrorResponse" type="ErrorResponseType">
+    <xsd:annotation>
+      <xsd:documentation>Resultat, falls die Signaturerstellung gescheitert ist</xsd:documentation>
+    </xsd:annotation>
+  </xsd:element>
+  <xsd:complexType name="ErrorResponseType">
+    <xsd:sequence>
+      <xsd:element name="ErrorCode" type="xsd:integer"/>
+      <xsd:element name="Info" type="xsd:string"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <!--########## Auxiliary Types ###-->
+  <xsd:simpleType name="KeyIdentifierType">
+    <xsd:restriction base="xsd:string"/>
+  </xsd:simpleType>
+  <xsd:simpleType name="KeyStorageType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="Software"/>
+      <xsd:enumeration value="Hardware"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="MimeTypeType">
+    <xsd:restriction base="xsd:token"/>
+  </xsd:simpleType>
+  <xsd:complexType name="AnyChildrenType" mixed="true">
+    <xsd:sequence>
+      <xsd:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="XMLContentType" mixed="true">
+    <xsd:complexContent mixed="true">
+      <xsd:extension base="AnyChildrenType">
+        <xsd:attribute ref="xml:space" use="optional"/>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="ContentBaseType">
+    <xsd:choice minOccurs="0">
+      <xsd:element name="Base64Content" type="xsd:base64Binary"/>
+      <xsd:element name="XMLContent" type="XMLContentType"/>
+      <xsd:element name="LocRefContent" type="xsd:anyURI"/>
+    </xsd:choice>
+  </xsd:complexType>
+  <xsd:complexType name="ContentExLocRefBaseType">
+    <xsd:complexContent>
+      <xsd:restriction base="ContentBaseType">
+        <xsd:choice minOccurs="0">
+          <xsd:element name="Base64Content" type="xsd:base64Binary"/>
+          <xsd:element name="XMLContent" type="XMLContentType"/>
+        </xsd:choice>
+      </xsd:restriction>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="ContentOptionalRefType">
+    <xsd:complexContent>
+      <xsd:extension base="ContentBaseType">
+        <xsd:attribute name="Reference" type="xsd:anyURI" use="optional"/>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="ContentRequiredRefType">
+    <xsd:complexContent>
+      <xsd:restriction base="ContentOptionalRefType">
+        <xsd:choice minOccurs="0">
+          <xsd:element name="Base64Content" type="xsd:base64Binary"/>
+          <xsd:element name="XMLContent" type="XMLContentType"/>
+          <xsd:element name="LocRefContent" type="xsd:anyURI"/>
+        </xsd:choice>
+        <xsd:attribute name="Reference" type="xsd:anyURI" use="required"/>
+      </xsd:restriction>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="VerifyTransformsDataType">
+    <xsd:choice maxOccurs="unbounded">
+      <xsd:annotation>
+        <xsd:documentation>Ein oder mehrere Transformationswege können von der Applikation an MOA mitgeteilt werden. Die zu prüfende Signatur hat zumindest einem dieser Transformationswege zu entsprechen. Die Angabe kann explizit oder als Profilbezeichner erfolgen.</xsd:documentation>
+      </xsd:annotation>
+      <xsd:element ref="VerifyTransformsInfoProfile"/>
+      <xsd:element name="VerifyTransformsInfoProfileID" type="xsd:string">
+        <xsd:annotation>
+          <xsd:documentation>Profilbezeichner für einen Transformationsweg</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+    </xsd:choice>
+  </xsd:complexType>
+  <xsd:element name="QualifiedCertificate"/>
+  <xsd:element name="PublicAuthority" type="PublicAuthorityType"/>
+  <xsd:complexType name="PublicAuthorityType">
+    <xsd:sequence>
+      <xsd:element name="Code" type="xsd:string" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:simpleType name="SignatoriesType">
+    <xsd:union memberTypes="AllSignatoriesType">
+      <xsd:simpleType>
+        <xsd:list itemType="xsd:positiveInteger"/>
+      </xsd:simpleType>
+    </xsd:union>
+  </xsd:simpleType>
+  <xsd:simpleType name="AllSignatoriesType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="all"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:complexType name="CreateSignatureLocationType">
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:token">
+        <xsd:attribute name="Index" type="xsd:nonNegativeInteger" use="required"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="TransformParameterType">
+    <xsd:choice minOccurs="0">
+      <xsd:annotation>
+        <xsd:documentation>Die Angabe des Transformationsparameters (explizit oder als Hashwert) kann unterlassen werden, wenn die Applikation von der Unveränderlichkeit des Inhalts der in "Transformationsparamter", Attribut "URI" angegebenen URI ausgehen kann.</xsd:documentation>
+      </xsd:annotation>
+      <xsd:element name="Base64Content" type="xsd:base64Binary">
+        <xsd:annotation>
+          <xsd:documentation>Der Transformationsparameter explizit angegeben.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="Hash">
+        <xsd:annotation>
+          <xsd:documentation>Der Hashwert des Transformationsparameters.</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element ref="dsig:DigestMethod"/>
+            <xsd:element ref="dsig:DigestValue"/>
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:choice>
+    <xsd:attribute name="URI" type="xsd:anyURI" use="required"/>
+  </xsd:complexType>
+  <xsd:element name="CreateSignatureEnvironmentProfile">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="CreateSignatureLocation" type="CreateSignatureLocationType"/>
+        <xsd:element name="Supplement" type="XMLDataObjectAssociationType" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:element name="VerifyTransformsInfoProfile">
+    <xsd:annotation>
+      <xsd:documentation>Explizite Angabe des Transformationswegs</xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element ref="dsig:Transforms" minOccurs="0"/>
+        <xsd:element name="TransformParameter" type="TransformParameterType" minOccurs="0" maxOccurs="unbounded">
+          <xsd:annotation>
+            <xsd:documentation>Alle impliziten Transformationsparameter, die zum Durchlaufen der oben angeführten Transformationskette bekannt sein müssen, müssen hier angeführt werden. Das Attribut "URI" bezeichnet den Transformationsparameter in exakt jener Weise, wie er in der zu überprüfenden Signatur gebraucht wird.</xsd:documentation>
+          </xsd:annotation>
+        </xsd:element>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:element name="Supplement" type="XMLDataObjectAssociationType"/>
+  <xsd:element name="SupplementProfile" type="XMLDataObjectAssociationType"/>
+  <xsd:element name="CreateTransformsInfoProfile">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="CreateTransformsInfo" type="TransformsInfoType"/>
+        <xsd:element ref="Supplement" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+</xsd:schema>
diff --git a/id/server/auth/src/main/webapp/WEB-INF/classes/META-INF/services/org.apache.axis.components.net.SecureSocketFactory b/id/server/auth/src/main/webapp/WEB-INF/classes/META-INF/services/org.apache.axis.components.net.SecureSocketFactory
deleted file mode 100644
index c4547e804..000000000
--- a/id/server/auth/src/main/webapp/WEB-INF/classes/META-INF/services/org.apache.axis.components.net.SecureSocketFactory
+++ /dev/null
@@ -1 +0,0 @@
-at.gv.egovernment.moa.id.util.AxisSecureSocketFactory
diff --git a/id/server/auth/src/main/webapp/WEB-INF/classes/resources/wsdl/MOA-ID-1.0.wsdl b/id/server/auth/src/main/webapp/WEB-INF/classes/resources/wsdl/MOA-ID-1.0.wsdl
deleted file mode 100644
index 5751b3e58..000000000
--- a/id/server/auth/src/main/webapp/WEB-INF/classes/resources/wsdl/MOA-ID-1.0.wsdl
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="MOA" targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:xsd="http://www.w3.org/1999/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl/">
-	<import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" location="MOA-20020812.xsd"/>
-	<message name="GetAuthenticationDataInput">
-		<part name="body" element="samlp:Request"/>
-	</message>
-	<message name="GetAuthenticationDataOutput">
-		<part name="body" element="samlp:Response"/>
-	</message>
-	<message name="MOAFault">
-		<part name="body" element="moa:ErrorResponse"/>
-	</message>
-	<portType name="IdentificationPortType">
-		<operation name="getAuthenticationData">
-			<input message="tns:GetAuthenticationDataInput"/>
-			<output message="tns:GetAuthenticationDataOutput"/>
-			<fault name="MOAFault" message="tns:MOAFault"/>
-		</operation>
-	</portType>
-	<binding name="IdentificationBinding" type="tns:IdentificationPortType" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/soap/ http://schemas.xmlsoap.org/wsdl/soap/">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<operation name="getAuthenticationData">
-			<soap:operation soapAction="urn:GetAuthenticationDataAction"/>
-			<input>
-				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
-			</input>
-			<output>
-				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
-			</output>
-			<fault name="MOAFault">
-				<soap:fault name="MOAFault" use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
-			</fault>
-		</operation>
-	</binding>
-	<service name="GetAuthenticationDataService">
-		<port name="IdentificationPort" binding="tns:IdentificationBinding">
-			<soap:address location="http://localhost/moa-id-auth/services/GetAuthenticationData"/>
-		</port>
-	</service>
-</definitions>
diff --git a/id/server/auth/src/main/webapp/WEB-INF/classes/resources/wsdl/MOA-ID-1.x.wsdl b/id/server/auth/src/main/webapp/WEB-INF/classes/resources/wsdl/MOA-ID-1.x.wsdl
deleted file mode 100644
index 45152cb38..000000000
--- a/id/server/auth/src/main/webapp/WEB-INF/classes/resources/wsdl/MOA-ID-1.x.wsdl
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="MOA" targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:xsd="http://www.w3.org/1999/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl/">
-	<import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" location="../resources/schemas/MOA-SPSS-1.2.xsd"/>
-	<message name="GetAuthenticationDataInput">
-		<part name="body" element="samlp:Request"/>
-	</message>
-	<message name="GetAuthenticationDataOutput">
-		<part name="body" element="samlp:Response"/>
-	</message>
-	<message name="MOAFault">
-		<part name="body" element="moa:ErrorResponse"/>
-	</message>
-	<portType name="IdentificationPortType">
-		<operation name="getAuthenticationData">
-			<input message="tns:GetAuthenticationDataInput"/>
-			<output message="tns:GetAuthenticationDataOutput"/>
-			<fault name="MOAFault" message="tns:MOAFault"/>
-		</operation>
-	</portType>
-	<binding name="IdentificationBinding" type="tns:IdentificationPortType" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/soap/ http://schemas.xmlsoap.org/wsdl/soap/">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<operation name="getAuthenticationData">
-			<soap:operation soapAction="urn:GetAuthenticationDataAction"/>
-			<input>
-				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
-			</input>
-			<output>
-				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
-			</output>
-			<fault name="MOAFault">
-				<soap:fault name="MOAFault" use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
-			</fault>
-		</operation>
-	</binding>
-	<service name="GetAuthenticationDataService">
-		<port name="IdentificationPort" binding="tns:IdentificationBinding">
-			<soap:address location="http://localhost/Identification"/>
-		</port>
-	</service>
-</definitions>
diff --git a/id/server/auth/src/main/webapp/WEB-INF/classes/resources/wsdl/MOA-SPSS-1.2.xsd b/id/server/auth/src/main/webapp/WEB-INF/classes/resources/wsdl/MOA-SPSS-1.2.xsd
deleted file mode 100644
index d7a06d6e7..000000000
--- a/id/server/auth/src/main/webapp/WEB-INF/classes/resources/wsdl/MOA-SPSS-1.2.xsd
+++ /dev/null
@@ -1,454 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  MOA SP/SS 1.2 Schema
--->
-<xsd:schema targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.2">
-  <xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
-  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-  <!--########## Create XML Signature ###-->
-  <!--### Create XML Signature Request ###-->
-  <xsd:element name="CreateXMLSignatureRequest">
-    <xsd:complexType>
-      <xsd:complexContent>
-        <xsd:extension base="CreateXMLSignatureRequestType"/>
-      </xsd:complexContent>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:complexType name="CreateXMLSignatureRequestType">
-    <xsd:sequence>
-      <xsd:element name="KeyIdentifier" type="KeyIdentifierType"/>
-      <xsd:element name="SingleSignatureInfo" maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>Ermöglichung der Stapelsignatur durch wiederholte Angabe dieses Elements</xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="DataObjectInfo" maxOccurs="unbounded">
-              <xsd:complexType>
-                <xsd:complexContent>
-                  <xsd:extension base="DataObjectInfoType">
-                    <xsd:attribute name="ChildOfManifest" type="xsd:boolean" use="optional" default="false"/>
-                  </xsd:extension>
-                </xsd:complexContent>
-              </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="CreateSignatureInfo" minOccurs="0">
-              <xsd:complexType>
-                <xsd:sequence>
-                  <xsd:element name="CreateSignatureEnvironment" type="ContentOptionalRefType"/>
-                  <xsd:choice>
-                    <xsd:annotation>
-                      <xsd:documentation>Auswahl: Entweder explizite Angabe des Signaturorts sowie ggf. sinnvoller Supplements im Zshg. mit der Signaturumgebung, oder Verweis auf ein benanntes Profil</xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:element ref="CreateSignatureEnvironmentProfile"/>
-                    <xsd:element name="CreateSignatureEnvironmentProfileID" type="ProfileIdentifierType"/>
-                  </xsd:choice>
-                </xsd:sequence>
-              </xsd:complexType>
-            </xsd:element>
-          </xsd:sequence>
-          <xsd:attribute name="SecurityLayerConformity" type="xsd:boolean" use="optional" default="true"/>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--### Create XML Signature Response ###-->
-  <xsd:complexType name="CreateXMLSignatureResponseType">
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:annotation>
-        <xsd:documentation>Kardinalität 1..oo erlaubt die Antwort auf eine Stapelsignatur-Anfrage</xsd:documentation>
-      </xsd:annotation>
-      <xsd:element name="SignatureEnvironment">
-        <xsd:annotation>
-          <xsd:documentation>Resultat, falls die Signaturerstellung erfolgreich war</xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any namespace="##any" processContents="lax"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element ref="ErrorResponse"/>
-    </xsd:choice>
-  </xsd:complexType>
-  <xsd:element name="CreateXMLSignatureResponse" type="CreateXMLSignatureResponseType"/>
-  <!--########## Verify CMS Signature ###-->
-  <!--### Verifiy CMS Signature Request ###-->
-  <xsd:element name="VerifyCMSSignatureRequest">
-    <xsd:complexType>
-      <xsd:complexContent>
-        <xsd:extension base="VerifyCMSSignatureRequestType">
-          <xsd:attribute name="Signatories" type="SignatoriesType" use="optional" default="1"/>
-        </xsd:extension>
-      </xsd:complexContent>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:complexType name="VerifyCMSSignatureRequestType">
-    <xsd:sequence>
-      <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
-      <xsd:element name="CMSSignature" type="xsd:base64Binary"/>
-      <xsd:element name="DataObject" type="CMSDataObjectOptionalMetaType" minOccurs="0"/>
-      <xsd:element name="TrustProfileID">
-        <xsd:annotation>
-          <xsd:documentation>mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--### Verify CMS Signature Response ###-->
-  <xsd:element name="VerifyCMSSignatureResponse" type="VerifyCMSSignatureResponseType"/>
-  <xsd:complexType name="VerifyCMSSignatureResponseType">
-    <xsd:sequence maxOccurs="unbounded">
-      <xsd:element name="SignerInfo" type="dsig:KeyInfoType">
-        <xsd:annotation>
-          <xsd:documentation>only ds:X509Data and RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any;publicAuthority is included as X509Data/any</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="SignatureCheck" type="CheckResultType"/>
-      <xsd:element name="CertificateCheck" type="CheckResultType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--########## Verify XML Signature ###-->
-  <!--### Verify XML Signature Request ###-->
-  <xsd:element name="VerifyXMLSignatureRequest" type="VerifyXMLSignatureRequestType"/>
-  <xsd:complexType name="VerifyXMLSignatureRequestType">
-    <xsd:sequence>
-      <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
-      <xsd:element name="VerifySignatureInfo">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="VerifySignatureEnvironment" type="ContentOptionalRefType"/>
-            <xsd:element name="VerifySignatureLocation" type="xsd:token"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:choice minOccurs="0" maxOccurs="unbounded">
-        <xsd:element ref="SupplementProfile"/>
-        <xsd:element name="SupplementProfileID" type="xsd:string"/>
-      </xsd:choice>
-      <xsd:element name="SignatureManifestCheckParams" minOccurs="0">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="ReferenceInfo" type="VerifyTransformsDataType" maxOccurs="unbounded">
-              <xsd:annotation>
-                <xsd:documentation>Pro dsig:Reference-Element in der zu überprüfenden XML-Signatur muss hier ein ReferenceInfo-Element erscheinen. Die Reihenfolge der einzelnen ReferenceInfo Elemente entspricht jener der dsig:Reference Elemente in der XML-Signatur.</xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-          </xsd:sequence>
-          <xsd:attribute name="ReturnReferenceInputData" type="xsd:boolean" use="optional" default="true"/>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="ReturnHashInputData" minOccurs="0"/>
-      <xsd:element name="TrustProfileID">
-        <xsd:annotation>
-          <xsd:documentation>mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--### Verify XML Signature Response ###-->
-  <xsd:element name="VerifyXMLSignatureResponse" type="VerifyXMLSignatureResponseType"/>
-  <xsd:complexType name="VerifyXMLSignatureResponseType">
-    <xsd:sequence>
-      <xsd:element name="SignerInfo" type="dsig:KeyInfoType">
-        <xsd:annotation>
-          <xsd:documentation>only ds:X509Data and ds:RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any; PublicAuthority is included as X509Data/any</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="HashInputData" type="ContentExLocRefBaseType" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="ReferenceInputData" type="ContentExLocRefBaseType" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="SignatureCheck" type="ReferencesCheckResultType"/>
-      <xsd:element name="SignatureManifestCheck" type="ReferencesCheckResultType" minOccurs="0"/>
-      <xsd:element name="XMLDSIGManifestCheck" type="ManifestRefsCheckResultType" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="CertificateCheck" type="CheckResultType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:simpleType name="ProfileIdentifierType">
-    <xsd:restriction base="xsd:token"/>
-  </xsd:simpleType>
-  <xsd:complexType name="MetaInfoType">
-    <xsd:sequence>
-      <xsd:element name="MimeType" type="MimeTypeType"/>
-      <xsd:element name="Description" type="xsd:anyURI" minOccurs="0"/>
-      <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="FinalDataMetaInfoType">
-    <xsd:complexContent>
-      <xsd:extension base="MetaInfoType">
-        <xsd:sequence>
-          <xsd:element name="Type" type="xsd:anyURI" minOccurs="0"/>
-        </xsd:sequence>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="DataObjectInfoType">
-    <xsd:sequence>
-      <xsd:element name="DataObject">
-        <xsd:complexType>
-          <xsd:complexContent>
-            <xsd:extension base="ContentOptionalRefType"/>
-          </xsd:complexContent>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:choice>
-        <xsd:annotation>
-          <xsd:documentation>Auswahl: Entweder explizite Angabe EINER Transformationskette inklusive ggf. sinnvoller Supplements oder Verweis auf ein benanntes Profil</xsd:documentation>
-        </xsd:annotation>
-        <xsd:element ref="CreateTransformsInfoProfile"/>
-        <xsd:element name="CreateTransformsInfoProfileID" type="ProfileIdentifierType"/>
-      </xsd:choice>
-    </xsd:sequence>
-    <xsd:attribute name="Structure" use="required">
-      <xsd:simpleType>
-        <xsd:restriction base="xsd:string">
-          <xsd:enumeration value="detached"/>
-          <xsd:enumeration value="enveloping"/>
-        </xsd:restriction>
-      </xsd:simpleType>
-    </xsd:attribute>
-  </xsd:complexType>
-  <xsd:complexType name="TransformsInfoType">
-    <xsd:sequence>
-      <xsd:element ref="dsig:Transforms" minOccurs="0"/>
-      <xsd:element name="FinalDataMetaInfo" type="FinalDataMetaInfoType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="XMLDataObjectAssociationType">
-    <xsd:sequence>
-      <xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>
-      <xsd:element name="Content" type="ContentRequiredRefType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CMSDataObjectOptionalMetaType">
-    <xsd:sequence>
-      <xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>
-      <xsd:element name="Content" type="CMSContentBaseType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CMSContentBaseType">
-    <xsd:complexContent>
-      <xsd:restriction base="ContentOptionalRefType">
-        <xsd:choice minOccurs="0">
-          <xsd:element name="Base64Content" type="xsd:base64Binary"/>
-        </xsd:choice>
-      </xsd:restriction>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="CheckResultType">
-    <xsd:sequence>
-      <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
-      <xsd:element name="Info" type="AnyChildrenType" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="ReferencesCheckResultType">
-    <xsd:complexContent>
-      <xsd:restriction base="CheckResultType">
-        <xsd:sequence>
-          <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
-          <xsd:element name="Info" type="ReferencesCheckResultInfoType" minOccurs="0"/>
-        </xsd:sequence>
-      </xsd:restriction>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="ReferencesCheckResultInfoType" mixed="true">
-    <xsd:complexContent mixed="true">
-      <xsd:restriction base="AnyChildrenType">
-        <xsd:sequence>
-          <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-          <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>
-        </xsd:sequence>
-      </xsd:restriction>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="ManifestRefsCheckResultType">
-    <xsd:complexContent>
-      <xsd:restriction base="CheckResultType">
-        <xsd:sequence>
-          <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
-          <xsd:element name="Info" type="ManifestRefsCheckResultInfoType"/>
-        </xsd:sequence>
-      </xsd:restriction>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="ManifestRefsCheckResultInfoType" mixed="true">
-    <xsd:complexContent mixed="true">
-      <xsd:restriction base="AnyChildrenType">
-        <xsd:sequence>
-          <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-          <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>
-          <xsd:element name="ReferringSigReference" type="xsd:positiveInteger"/>
-        </xsd:sequence>
-      </xsd:restriction>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <!--########## Error Response ###-->
-  <xsd:element name="ErrorResponse" type="ErrorResponseType">
-    <xsd:annotation>
-      <xsd:documentation>Resultat, falls die Signaturerstellung gescheitert ist</xsd:documentation>
-    </xsd:annotation>
-  </xsd:element>
-  <xsd:complexType name="ErrorResponseType">
-    <xsd:sequence>
-      <xsd:element name="ErrorCode" type="xsd:integer"/>
-      <xsd:element name="Info" type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--########## Auxiliary Types ###-->
-  <xsd:simpleType name="KeyIdentifierType">
-    <xsd:restriction base="xsd:string"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="KeyStorageType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="Software"/>
-      <xsd:enumeration value="Hardware"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="MimeTypeType">
-    <xsd:restriction base="xsd:token"/>
-  </xsd:simpleType>
-  <xsd:complexType name="AnyChildrenType" mixed="true">
-    <xsd:sequence>
-      <xsd:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="XMLContentType" mixed="true">
-    <xsd:complexContent mixed="true">
-      <xsd:extension base="AnyChildrenType">
-        <xsd:attribute ref="xml:space" use="optional"/>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="ContentBaseType">
-    <xsd:choice minOccurs="0">
-      <xsd:element name="Base64Content" type="xsd:base64Binary"/>
-      <xsd:element name="XMLContent" type="XMLContentType"/>
-      <xsd:element name="LocRefContent" type="xsd:anyURI"/>
-    </xsd:choice>
-  </xsd:complexType>
-  <xsd:complexType name="ContentExLocRefBaseType">
-    <xsd:complexContent>
-      <xsd:restriction base="ContentBaseType">
-        <xsd:choice minOccurs="0">
-          <xsd:element name="Base64Content" type="xsd:base64Binary"/>
-          <xsd:element name="XMLContent" type="XMLContentType"/>
-        </xsd:choice>
-      </xsd:restriction>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="ContentOptionalRefType">
-    <xsd:complexContent>
-      <xsd:extension base="ContentBaseType">
-        <xsd:attribute name="Reference" type="xsd:anyURI" use="optional"/>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="ContentRequiredRefType">
-    <xsd:complexContent>
-      <xsd:restriction base="ContentOptionalRefType">
-        <xsd:choice minOccurs="0">
-          <xsd:element name="Base64Content" type="xsd:base64Binary"/>
-          <xsd:element name="XMLContent" type="XMLContentType"/>
-          <xsd:element name="LocRefContent" type="xsd:anyURI"/>
-        </xsd:choice>
-        <xsd:attribute name="Reference" type="xsd:anyURI" use="required"/>
-      </xsd:restriction>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="VerifyTransformsDataType">
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:annotation>
-        <xsd:documentation>Ein oder mehrere Transformationswege können von der Applikation an MOA mitgeteilt werden. Die zu prüfende Signatur hat zumindest einem dieser Transformationswege zu entsprechen. Die Angabe kann explizit oder als Profilbezeichner erfolgen.</xsd:documentation>
-      </xsd:annotation>
-      <xsd:element ref="VerifyTransformsInfoProfile"/>
-      <xsd:element name="VerifyTransformsInfoProfileID" type="xsd:string">
-        <xsd:annotation>
-          <xsd:documentation>Profilbezeichner für einen Transformationsweg</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:choice>
-  </xsd:complexType>
-  <xsd:element name="QualifiedCertificate"/>
-  <xsd:element name="PublicAuthority" type="PublicAuthorityType"/>
-  <xsd:complexType name="PublicAuthorityType">
-    <xsd:sequence>
-      <xsd:element name="Code" type="xsd:string" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:simpleType name="SignatoriesType">
-    <xsd:union memberTypes="AllSignatoriesType">
-      <xsd:simpleType>
-        <xsd:list itemType="xsd:positiveInteger"/>
-      </xsd:simpleType>
-    </xsd:union>
-  </xsd:simpleType>
-  <xsd:simpleType name="AllSignatoriesType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="all"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CreateSignatureLocationType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:token">
-        <xsd:attribute name="Index" type="xsd:nonNegativeInteger" use="required"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="TransformParameterType">
-    <xsd:choice minOccurs="0">
-      <xsd:annotation>
-        <xsd:documentation>Die Angabe des Transformationsparameters (explizit oder als Hashwert) kann unterlassen werden, wenn die Applikation von der Unveränderlichkeit des Inhalts der in "Transformationsparamter", Attribut "URI" angegebenen URI ausgehen kann.</xsd:documentation>
-      </xsd:annotation>
-      <xsd:element name="Base64Content" type="xsd:base64Binary">
-        <xsd:annotation>
-          <xsd:documentation>Der Transformationsparameter explizit angegeben.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="Hash">
-        <xsd:annotation>
-          <xsd:documentation>Der Hashwert des Transformationsparameters.</xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element ref="dsig:DigestMethod"/>
-            <xsd:element ref="dsig:DigestValue"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:choice>
-    <xsd:attribute name="URI" type="xsd:anyURI" use="required"/>
-  </xsd:complexType>
-  <xsd:element name="CreateSignatureEnvironmentProfile">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="CreateSignatureLocation" type="CreateSignatureLocationType"/>
-        <xsd:element name="Supplement" type="XMLDataObjectAssociationType" minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="VerifyTransformsInfoProfile">
-    <xsd:annotation>
-      <xsd:documentation>Explizite Angabe des Transformationswegs</xsd:documentation>
-    </xsd:annotation>
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element ref="dsig:Transforms" minOccurs="0"/>
-        <xsd:element name="TransformParameter" type="TransformParameterType" minOccurs="0" maxOccurs="unbounded">
-          <xsd:annotation>
-            <xsd:documentation>Alle impliziten Transformationsparameter, die zum Durchlaufen der oben angeführten Transformationskette bekannt sein müssen, müssen hier angeführt werden. Das Attribut "URI" bezeichnet den Transformationsparameter in exakt jener Weise, wie er in der zu überprüfenden Signatur gebraucht wird.</xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="Supplement" type="XMLDataObjectAssociationType"/>
-  <xsd:element name="SupplementProfile" type="XMLDataObjectAssociationType"/>
-  <xsd:element name="CreateTransformsInfoProfile">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="CreateTransformsInfo" type="TransformsInfoType"/>
-        <xsd:element ref="Supplement" minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-</xsd:schema>
-- 
cgit v1.2.3


From fd99a8b31a752135c8e2f16041ba35da70c7b2dc Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Thu, 23 Aug 2007 08:38:49 +0000
Subject: Updated dependency declarations to omit certain transitive
 dependencies from being included into war-files.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@936 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/auth/pom.xml | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

(limited to 'id/server/auth')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 8dd93220b..80eabe6d0 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -59,6 +59,49 @@
             <artifactId>moa-id-lib</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <!-- transitive dependencies we don't want to include into the war -->
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_jce_full</artifactId>
+            <!-- should be in the ext directory of the jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_ecc</artifactId>
+            <!-- should be in the ext directory of the jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_Pkcs11Provider</artifactId>
+            <!-- should be in the ext directory of the jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_Pkcs11Wrapper</artifactId>
+            <!-- should be in the ext directory of the jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+            <!-- should be provided by the container or jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <!-- should be provided by the container or jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xmlParserAPIs</artifactId>
+            <!-- should be provided by the container or jre -->
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 </project>
-- 
cgit v1.2.3


From 189f12c42b38d58d1b324daa573153111bd2f7a4 Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Fri, 24 Aug 2007 11:52:28 +0000
Subject: build optimizations, updated documentation and sample configuration

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@953 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/auth/pom.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'id/server/auth')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 80eabe6d0..d0c8c1612 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -30,6 +30,7 @@
                             <addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                         </manifest>
+                        <addMavenDescriptor>false</addMavenDescriptor>
                     </archive>
 <!--
                     <webResources>
-- 
cgit v1.2.3


From ef5f57de87191f8296359c4141d562453d15ca20 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Tue, 28 Aug 2007 07:35:22 +0000
Subject: The xalan.jar of the official xalan distribution and the one in the
 central repository differ. So, we are going to include the official one in
 our own distribution to prevent from problems with different versions in the
 endorsed directory of the servlet container or jre.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@966 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/auth/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index d0c8c1612..b3bb1f8b0 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -86,7 +86,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>xalan</groupId>
+            <groupId>xalan-bin-dist</groupId>
             <artifactId>xalan</artifactId>
             <!-- should be provided by the container or jre -->
             <scope>provided</scope>
-- 
cgit v1.2.3


From 6be52df44678056f95d36f08361b94e2befeb044 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Tue, 28 Aug 2007 11:53:33 +0000
Subject: Xalan artifact serializer.jar added.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@968 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/auth/pom.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index b3bb1f8b0..54f7ee54e 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -98,8 +98,14 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xmlParserAPIs</artifactId>
+            <groupId>xalan-bin-dist</groupId>
+            <artifactId>xml-apis</artifactId>
+            <!-- should be provided by the container or jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>xalan-bin-dist</groupId>
+            <artifactId>serializer</artifactId>
             <!-- should be provided by the container or jre -->
             <scope>provided</scope>
         </dependency>
-- 
cgit v1.2.3


From 74a6925a47adaac292b3e2da326b08adc0239235 Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Tue, 4 Sep 2007 13:55:12 +0000
Subject: version change to 1.4.1

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@985 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/auth/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 54f7ee54e..869d94c2e 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -4,14 +4,14 @@
     <parent>
         <groupId>MOA.id</groupId>
         <artifactId>moa-id</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>MOA.id.server</groupId>
     <artifactId>moa-id-auth</artifactId>
     <packaging>war</packaging>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
     <name>MOA ID-Auth WebService</name>
 
     <properties>
-- 
cgit v1.2.3


From 4e12d1df5daab1f7600fa3a58e6fc535375224ff Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Mon, 10 Sep 2007 15:16:34 +0000
Subject: moved test classes, cashing of resolved entities

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1002 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/auth/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 869d94c2e..57aea5ac4 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -4,14 +4,14 @@
     <parent>
         <groupId>MOA.id</groupId>
         <artifactId>moa-id</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>MOA.id.server</groupId>
     <artifactId>moa-id-auth</artifactId>
     <packaging>war</packaging>
-    <version>1.4.1</version>
+    <version>1.4.2</version>
     <name>MOA ID-Auth WebService</name>
 
     <properties>
-- 
cgit v1.2.3


From b33fd8084f4ea1562c9056422ebc111b4a92f2a6 Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Mon, 10 Sep 2007 18:08:08 +0000
Subject: moved test classes, fixed spss-tools build

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1003 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/auth/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 57aea5ac4..ef53ba336 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -53,12 +53,12 @@
         <dependency>
             <groupId>MOA.spss.server</groupId>
             <artifactId>moa-spss-lib</artifactId>
-            <version>${project.version}</version>
+            <!--version>${project.version}</version-->
         </dependency>
         <dependency>
             <groupId>MOA.id.server</groupId>
             <artifactId>moa-id-lib</artifactId>
-            <version>${project.version}</version>
+            <!--version>${project.version}</version-->
         </dependency>
         <!-- transitive dependencies we don't want to include into the war -->
         <dependency>
-- 
cgit v1.2.3


From 20689558ce4a30b369644e9cf31619237490517f Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Thu, 13 Sep 2007 09:36:37 +0000
Subject: went back to axis 1.0 in SP/SS (dsig-Namespaceproblem on provided
 Stylesheets), fixed bug in transactions entity-cache

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1008 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/auth/pom.xml | 206 +++++++++++++++++++++++++------------------------
 1 file changed, 105 insertions(+), 101 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index ef53ba336..5c2d64192 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -1,37 +1,35 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <parent>
-        <groupId>MOA.id</groupId>
-        <artifactId>moa-id</artifactId>
-        <version>1.4.2</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>MOA.id.server</groupId>
-    <artifactId>moa-id-auth</artifactId>
-    <packaging>war</packaging>
-    <version>1.4.2</version>
-    <name>MOA ID-Auth WebService</name>
-
-    <properties>
-        <repositoryPath>${basedir}/../../../repository</repositoryPath>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>2.0.2</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                        </manifest>
-                        <addMavenDescriptor>false</addMavenDescriptor>
-                    </archive>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<parent>
+		<groupId>MOA.id</groupId>
+		<artifactId>moa-id</artifactId>
+		<version>1.4.2beta1</version>
+	</parent>
+	
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>MOA.id.server</groupId>
+	<artifactId>moa-id-auth</artifactId>
+	<packaging>war</packaging>
+	<version>1.4.2beta1</version>
+	<name>MOA ID-Auth WebService</name>
+	
+	<properties>
+		<repositoryPath>${basedir}/../../../repository</repositoryPath>
+	</properties>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>2.0.2</version>
+				<configuration>
+					<archive>
+						<manifest>
+							<addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+						<addMavenDescriptor>false</addMavenDescriptor>
+					</archive>
 <!--
                     <webResources>
                         <resource>
@@ -43,72 +41,78 @@
                             <targetPath>WEB-INF/classes/META-INF/services</targetPath>
                         </resource>
                     </webResources>
--->                    
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>MOA.spss.server</groupId>
-            <artifactId>moa-spss-lib</artifactId>
-            <!--version>${project.version}</version-->
-        </dependency>
-        <dependency>
-            <groupId>MOA.id.server</groupId>
-            <artifactId>moa-id-lib</artifactId>
-            <!--version>${project.version}</version-->
-        </dependency>
-        <!-- transitive dependencies we don't want to include into the war -->
-        <dependency>
-            <groupId>iaik.prod</groupId>
-            <artifactId>iaik_jce_full</artifactId>
-            <!-- should be in the ext directory of the jre -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>iaik.prod</groupId>
-            <artifactId>iaik_ecc</artifactId>
-            <!-- should be in the ext directory of the jre -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>iaik.prod</groupId>
-            <artifactId>iaik_Pkcs11Provider</artifactId>
-            <!-- should be in the ext directory of the jre -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>iaik.prod</groupId>
-            <artifactId>iaik_Pkcs11Wrapper</artifactId>
-            <!-- should be in the ext directory of the jre -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>xalan-bin-dist</groupId>
-            <artifactId>xalan</artifactId>
-            <!-- should be provided by the container or jre -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <!-- should be provided by the container or jre -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>xalan-bin-dist</groupId>
-            <artifactId>xml-apis</artifactId>
-            <!-- should be provided by the container or jre -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>xalan-bin-dist</groupId>
-            <artifactId>serializer</artifactId>
-            <!-- should be provided by the container or jre -->
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
+-->
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	
+	<dependencies>
+		<!-- we need Axis 1.4 here because 1.0 is in SPSS included -->
+		<dependency>
+			<groupId>axis</groupId>
+			<artifactId>axis</artifactId>
+			<version>1.4</version>
+		</dependency>
+		<dependency>
+			<groupId>MOA.spss.server</groupId>
+			<artifactId>moa-spss-lib</artifactId>
+			<!--version>${project.version}</version-->
+		</dependency>
+		<dependency>
+			<groupId>MOA.id.server</groupId>
+			<artifactId>moa-id-lib</artifactId>
+			<!--version>${project.version}</version-->
+		</dependency>
+		<!-- transitive dependencies we don't want to include into the war -->
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_jce_full</artifactId>
+			<!-- should be in the ext directory of the jre -->
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_ecc</artifactId>
+			<!-- should be in the ext directory of the jre -->
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_Pkcs11Provider</artifactId>
+			<!-- should be in the ext directory of the jre -->
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_Pkcs11Wrapper</artifactId>
+			<!-- should be in the ext directory of the jre -->
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>xalan-bin-dist</groupId>
+			<artifactId>xalan</artifactId>
+			<!-- should be provided by the container or jre -->
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<!-- should be provided by the container or jre -->
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>xalan-bin-dist</groupId>
+			<artifactId>xml-apis</artifactId>
+			<!-- should be provided by the container or jre -->
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>xalan-bin-dist</groupId>
+			<artifactId>serializer</artifactId>
+			<!-- should be provided by the container or jre -->
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
 
 </project>
-- 
cgit v1.2.3


From 18222e4c26ece81621f04ba090b0345da5dcac2a Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Fri, 14 Sep 2007 12:44:18 +0000
Subject: documented changes

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1009 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/auth/pom.xml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 5c2d64192..9870c7ef6 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -17,6 +17,8 @@
 	</properties>
 	
 	<build>
+		<!--sourceDirectory>${basedir}/../idserverlib/src/main/java</sourceDirectory-->
+		<!--testSourceDirectory>${basedir}/../idserverlib/src/test/java</testSourceDirectory-->
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -30,17 +32,16 @@
 						</manifest>
 						<addMavenDescriptor>false</addMavenDescriptor>
 					</archive>
-<!--
-                    <webResources>
-                        <resource>
-                            <directory>${basedir}/../resources</directory>
-                            <targetPath>WEB-INF/classes/resources</targetPath>
-                        </resource>
-                        <resource>
-                            <directory>${basedir}/../services</directory>
-                            <targetPath>WEB-INF/classes/META-INF/services</targetPath>
-                        </resource>
-                    </webResources>
+
+					<!-- extract moa-id classes for debugging -->
+					<!--warSourceExcludes>WEB-INF/lib/moa-id-lib*.jar</warSourceExcludes-->
+					<!--
+					<webResources>
+						<resource>
+							<directory>${basedir}/../idserverlib/target/classes</directory>
+							<targetPath>WEB-INF/classes</targetPath>
+						</resource>
+					</webResources>
 -->
 				</configuration>
 			</plugin>
@@ -62,7 +63,7 @@
 		<dependency>
 			<groupId>MOA.id.server</groupId>
 			<artifactId>moa-id-lib</artifactId>
-			<!--version>${project.version}</version-->
+			<!--version>${project.version}</version -->
 		</dependency>
 		<!-- transitive dependencies we don't want to include into the war -->
 		<dependency>
-- 
cgit v1.2.3


From 83f01ddf24d98dbb5df41fb627a14edee2d57df7 Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 17 Oct 2007 16:18:44 +0000
Subject: Implemented and integrated party representation and integrated
 mandates as per default available Now Eclipse projects are available. The Web
 Tools Platform can be used to run the web applications

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1014 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/auth/.classpath                          |   7 +
 id/server/auth/.project                            |  44 ++
 .../auth/.settings/org.eclipse.jdt.core.prefs      |   7 +
 .../.settings/org.eclipse.wst.common.component     |  16 +
 .../org.eclipse.wst.common.project.facet.core.xml  |   5 +
 id/server/auth/pom.xml                             |  12 +-
 .../main/resources/resources/wsdl/MOA-ID-1.0.wsdl  |  40 --
 .../main/resources/resources/wsdl/MOA-ID-1.x.wsdl  |  40 --
 .../main/resources/resources/wsdl/MOA-SPSS-1.2.xsd | 454 -------------
 .../auth/src/main/webapp/META-INF/MANIFEST.MF      |   2 +
 id/server/auth/src/main/webapp/WEB-INF/web.xml     |  18 +-
 id/server/auth/src/main/webapp/css/mandates.css    |  57 ++
 id/server/auth/src/main/webapp/css/styles.css      | 741 +++++++++++++++++++++
 .../auth/src/main/webapp/css/styles_opera.css      |  11 +
 .../auth/src/main/webapp/img/egov_schrift.gif      | Bin 0 -> 1843 bytes
 id/server/auth/src/main/webapp/img/info.gif        | Bin 0 -> 892 bytes
 id/server/auth/src/main/webapp/img/rufezeichen.gif | Bin 0 -> 844 bytes
 id/server/auth/src/main/webapp/img/stern.gif       | Bin 0 -> 856 bytes
 id/server/auth/src/main/webapp/javascript/fa.js    |   8 +
 .../auth/src/main/webapp/javascript/formallg.js    | 315 +++++++++
 id/server/auth/src/main/wsdl/MOA-ID-1.0.wsdl       |  40 ++
 id/server/auth/src/main/wsdl/MOA-ID-1.x.wsdl       |  40 ++
 id/server/auth/src/main/wsdl/MOA-SPSS-1.2.xsd      | 454 +++++++++++++
 23 files changed, 1768 insertions(+), 543 deletions(-)
 create mode 100644 id/server/auth/.classpath
 create mode 100644 id/server/auth/.project
 create mode 100644 id/server/auth/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 id/server/auth/.settings/org.eclipse.wst.common.component
 create mode 100644 id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml
 delete mode 100644 id/server/auth/src/main/resources/resources/wsdl/MOA-ID-1.0.wsdl
 delete mode 100644 id/server/auth/src/main/resources/resources/wsdl/MOA-ID-1.x.wsdl
 delete mode 100644 id/server/auth/src/main/resources/resources/wsdl/MOA-SPSS-1.2.xsd
 create mode 100644 id/server/auth/src/main/webapp/META-INF/MANIFEST.MF
 create mode 100644 id/server/auth/src/main/webapp/css/mandates.css
 create mode 100644 id/server/auth/src/main/webapp/css/styles.css
 create mode 100644 id/server/auth/src/main/webapp/css/styles_opera.css
 create mode 100644 id/server/auth/src/main/webapp/img/egov_schrift.gif
 create mode 100644 id/server/auth/src/main/webapp/img/info.gif
 create mode 100644 id/server/auth/src/main/webapp/img/rufezeichen.gif
 create mode 100644 id/server/auth/src/main/webapp/img/stern.gif
 create mode 100644 id/server/auth/src/main/webapp/javascript/fa.js
 create mode 100644 id/server/auth/src/main/webapp/javascript/formallg.js
 create mode 100644 id/server/auth/src/main/wsdl/MOA-ID-1.0.wsdl
 create mode 100644 id/server/auth/src/main/wsdl/MOA-ID-1.x.wsdl
 create mode 100644 id/server/auth/src/main/wsdl/MOA-SPSS-1.2.xsd

(limited to 'id/server/auth')

diff --git a/id/server/auth/.classpath b/id/server/auth/.classpath
new file mode 100644
index 000000000..46c5c5ab0
--- /dev/null
+++ b/id/server/auth/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v5.0"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/id/server/auth/.project b/id/server/auth/.project
new file mode 100644
index 000000000..a8a455ff2
--- /dev/null
+++ b/id/server/auth/.project
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>moa-id-auth</name>
+	<comment></comment>
+	<projects>
+		<project>moa-id-lib</project>
+		<project>moa-spss-lib</project>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>kr.javanese.devtools.m2wtp.wtpDepBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>kr.javanese.devtools.m2wtp.m2wtpNature</nature>
+	</natures>
+</projectDescription>
diff --git a/id/server/auth/.settings/org.eclipse.jdt.core.prefs b/id/server/auth/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..1b042e027
--- /dev/null
+++ b/id/server/auth/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Fri Sep 14 14:27:19 CEST 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.4
diff --git a/id/server/auth/.settings/org.eclipse.wst.common.component b/id/server/auth/.settings/org.eclipse.wst.common.component
new file mode 100644
index 000000000..f256fdc92
--- /dev/null
+++ b/id/server/auth/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+<wb-module deploy-name="moa-id-auth">
+<wb-resource deploy-path="/" source-path="/src/main/webapp"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+<dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
+<dependency-type>uses</dependency-type>
+</dependent-module>
+<dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">
+<dependency-type>uses</dependency-type>
+<wb-resource deploy-path="/WEB-INF/LIB" source-path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+</dependent-module>
+<property name="java-output-path" value="target/classes"/>
+<property name="context-root" value="moa-id-auth"/>
+</wb-module>
+</project-modules>
diff --git a/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 000000000..d0145894a
--- /dev/null
+++ b/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="jst.web" version="2.4"/>
+  <installed facet="jst.java" version="1.4"/>
+</faceted-project>
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 9870c7ef6..2c123a8ec 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>1.4.2beta1</version>
+		<version>1.4.2beta2</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-auth</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.2beta1</version>
+	<version>1.4.2beta2</version>
 	<name>MOA ID-Auth WebService</name>
 	
 	<properties>
@@ -35,14 +35,18 @@
 
 					<!-- extract moa-id classes for debugging -->
 					<!--warSourceExcludes>WEB-INF/lib/moa-id-lib*.jar</warSourceExcludes-->
-					<!--
 					<webResources>
+						<resource>
+							<directory>${basedir}/src/main/wsdl</directory>
+							<targetPath>WEB-INF/classes/resources/wsdl</targetPath>
+						</resource>
+					<!--
 						<resource>
 							<directory>${basedir}/../idserverlib/target/classes</directory>
 							<targetPath>WEB-INF/classes</targetPath>
 						</resource>
-					</webResources>
 -->
+					</webResources>
 				</configuration>
 			</plugin>
 		</plugins>
diff --git a/id/server/auth/src/main/resources/resources/wsdl/MOA-ID-1.0.wsdl b/id/server/auth/src/main/resources/resources/wsdl/MOA-ID-1.0.wsdl
deleted file mode 100644
index 5751b3e58..000000000
--- a/id/server/auth/src/main/resources/resources/wsdl/MOA-ID-1.0.wsdl
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="MOA" targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:xsd="http://www.w3.org/1999/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl/">
-	<import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" location="MOA-20020812.xsd"/>
-	<message name="GetAuthenticationDataInput">
-		<part name="body" element="samlp:Request"/>
-	</message>
-	<message name="GetAuthenticationDataOutput">
-		<part name="body" element="samlp:Response"/>
-	</message>
-	<message name="MOAFault">
-		<part name="body" element="moa:ErrorResponse"/>
-	</message>
-	<portType name="IdentificationPortType">
-		<operation name="getAuthenticationData">
-			<input message="tns:GetAuthenticationDataInput"/>
-			<output message="tns:GetAuthenticationDataOutput"/>
-			<fault name="MOAFault" message="tns:MOAFault"/>
-		</operation>
-	</portType>
-	<binding name="IdentificationBinding" type="tns:IdentificationPortType" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/soap/ http://schemas.xmlsoap.org/wsdl/soap/">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<operation name="getAuthenticationData">
-			<soap:operation soapAction="urn:GetAuthenticationDataAction"/>
-			<input>
-				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
-			</input>
-			<output>
-				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
-			</output>
-			<fault name="MOAFault">
-				<soap:fault name="MOAFault" use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
-			</fault>
-		</operation>
-	</binding>
-	<service name="GetAuthenticationDataService">
-		<port name="IdentificationPort" binding="tns:IdentificationBinding">
-			<soap:address location="http://localhost/moa-id-auth/services/GetAuthenticationData"/>
-		</port>
-	</service>
-</definitions>
diff --git a/id/server/auth/src/main/resources/resources/wsdl/MOA-ID-1.x.wsdl b/id/server/auth/src/main/resources/resources/wsdl/MOA-ID-1.x.wsdl
deleted file mode 100644
index 45152cb38..000000000
--- a/id/server/auth/src/main/resources/resources/wsdl/MOA-ID-1.x.wsdl
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="MOA" targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:xsd="http://www.w3.org/1999/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl/">
-	<import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" location="../resources/schemas/MOA-SPSS-1.2.xsd"/>
-	<message name="GetAuthenticationDataInput">
-		<part name="body" element="samlp:Request"/>
-	</message>
-	<message name="GetAuthenticationDataOutput">
-		<part name="body" element="samlp:Response"/>
-	</message>
-	<message name="MOAFault">
-		<part name="body" element="moa:ErrorResponse"/>
-	</message>
-	<portType name="IdentificationPortType">
-		<operation name="getAuthenticationData">
-			<input message="tns:GetAuthenticationDataInput"/>
-			<output message="tns:GetAuthenticationDataOutput"/>
-			<fault name="MOAFault" message="tns:MOAFault"/>
-		</operation>
-	</portType>
-	<binding name="IdentificationBinding" type="tns:IdentificationPortType" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/soap/ http://schemas.xmlsoap.org/wsdl/soap/">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<operation name="getAuthenticationData">
-			<soap:operation soapAction="urn:GetAuthenticationDataAction"/>
-			<input>
-				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
-			</input>
-			<output>
-				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
-			</output>
-			<fault name="MOAFault">
-				<soap:fault name="MOAFault" use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
-			</fault>
-		</operation>
-	</binding>
-	<service name="GetAuthenticationDataService">
-		<port name="IdentificationPort" binding="tns:IdentificationBinding">
-			<soap:address location="http://localhost/Identification"/>
-		</port>
-	</service>
-</definitions>
diff --git a/id/server/auth/src/main/resources/resources/wsdl/MOA-SPSS-1.2.xsd b/id/server/auth/src/main/resources/resources/wsdl/MOA-SPSS-1.2.xsd
deleted file mode 100644
index d7a06d6e7..000000000
--- a/id/server/auth/src/main/resources/resources/wsdl/MOA-SPSS-1.2.xsd
+++ /dev/null
@@ -1,454 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  MOA SP/SS 1.2 Schema
--->
-<xsd:schema targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.2">
-  <xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
-  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-  <!--########## Create XML Signature ###-->
-  <!--### Create XML Signature Request ###-->
-  <xsd:element name="CreateXMLSignatureRequest">
-    <xsd:complexType>
-      <xsd:complexContent>
-        <xsd:extension base="CreateXMLSignatureRequestType"/>
-      </xsd:complexContent>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:complexType name="CreateXMLSignatureRequestType">
-    <xsd:sequence>
-      <xsd:element name="KeyIdentifier" type="KeyIdentifierType"/>
-      <xsd:element name="SingleSignatureInfo" maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>Ermöglichung der Stapelsignatur durch wiederholte Angabe dieses Elements</xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="DataObjectInfo" maxOccurs="unbounded">
-              <xsd:complexType>
-                <xsd:complexContent>
-                  <xsd:extension base="DataObjectInfoType">
-                    <xsd:attribute name="ChildOfManifest" type="xsd:boolean" use="optional" default="false"/>
-                  </xsd:extension>
-                </xsd:complexContent>
-              </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="CreateSignatureInfo" minOccurs="0">
-              <xsd:complexType>
-                <xsd:sequence>
-                  <xsd:element name="CreateSignatureEnvironment" type="ContentOptionalRefType"/>
-                  <xsd:choice>
-                    <xsd:annotation>
-                      <xsd:documentation>Auswahl: Entweder explizite Angabe des Signaturorts sowie ggf. sinnvoller Supplements im Zshg. mit der Signaturumgebung, oder Verweis auf ein benanntes Profil</xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:element ref="CreateSignatureEnvironmentProfile"/>
-                    <xsd:element name="CreateSignatureEnvironmentProfileID" type="ProfileIdentifierType"/>
-                  </xsd:choice>
-                </xsd:sequence>
-              </xsd:complexType>
-            </xsd:element>
-          </xsd:sequence>
-          <xsd:attribute name="SecurityLayerConformity" type="xsd:boolean" use="optional" default="true"/>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--### Create XML Signature Response ###-->
-  <xsd:complexType name="CreateXMLSignatureResponseType">
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:annotation>
-        <xsd:documentation>Kardinalität 1..oo erlaubt die Antwort auf eine Stapelsignatur-Anfrage</xsd:documentation>
-      </xsd:annotation>
-      <xsd:element name="SignatureEnvironment">
-        <xsd:annotation>
-          <xsd:documentation>Resultat, falls die Signaturerstellung erfolgreich war</xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:any namespace="##any" processContents="lax"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element ref="ErrorResponse"/>
-    </xsd:choice>
-  </xsd:complexType>
-  <xsd:element name="CreateXMLSignatureResponse" type="CreateXMLSignatureResponseType"/>
-  <!--########## Verify CMS Signature ###-->
-  <!--### Verifiy CMS Signature Request ###-->
-  <xsd:element name="VerifyCMSSignatureRequest">
-    <xsd:complexType>
-      <xsd:complexContent>
-        <xsd:extension base="VerifyCMSSignatureRequestType">
-          <xsd:attribute name="Signatories" type="SignatoriesType" use="optional" default="1"/>
-        </xsd:extension>
-      </xsd:complexContent>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:complexType name="VerifyCMSSignatureRequestType">
-    <xsd:sequence>
-      <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
-      <xsd:element name="CMSSignature" type="xsd:base64Binary"/>
-      <xsd:element name="DataObject" type="CMSDataObjectOptionalMetaType" minOccurs="0"/>
-      <xsd:element name="TrustProfileID">
-        <xsd:annotation>
-          <xsd:documentation>mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--### Verify CMS Signature Response ###-->
-  <xsd:element name="VerifyCMSSignatureResponse" type="VerifyCMSSignatureResponseType"/>
-  <xsd:complexType name="VerifyCMSSignatureResponseType">
-    <xsd:sequence maxOccurs="unbounded">
-      <xsd:element name="SignerInfo" type="dsig:KeyInfoType">
-        <xsd:annotation>
-          <xsd:documentation>only ds:X509Data and RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any;publicAuthority is included as X509Data/any</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="SignatureCheck" type="CheckResultType"/>
-      <xsd:element name="CertificateCheck" type="CheckResultType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--########## Verify XML Signature ###-->
-  <!--### Verify XML Signature Request ###-->
-  <xsd:element name="VerifyXMLSignatureRequest" type="VerifyXMLSignatureRequestType"/>
-  <xsd:complexType name="VerifyXMLSignatureRequestType">
-    <xsd:sequence>
-      <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
-      <xsd:element name="VerifySignatureInfo">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="VerifySignatureEnvironment" type="ContentOptionalRefType"/>
-            <xsd:element name="VerifySignatureLocation" type="xsd:token"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:choice minOccurs="0" maxOccurs="unbounded">
-        <xsd:element ref="SupplementProfile"/>
-        <xsd:element name="SupplementProfileID" type="xsd:string"/>
-      </xsd:choice>
-      <xsd:element name="SignatureManifestCheckParams" minOccurs="0">
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="ReferenceInfo" type="VerifyTransformsDataType" maxOccurs="unbounded">
-              <xsd:annotation>
-                <xsd:documentation>Pro dsig:Reference-Element in der zu überprüfenden XML-Signatur muss hier ein ReferenceInfo-Element erscheinen. Die Reihenfolge der einzelnen ReferenceInfo Elemente entspricht jener der dsig:Reference Elemente in der XML-Signatur.</xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-          </xsd:sequence>
-          <xsd:attribute name="ReturnReferenceInputData" type="xsd:boolean" use="optional" default="true"/>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="ReturnHashInputData" minOccurs="0"/>
-      <xsd:element name="TrustProfileID">
-        <xsd:annotation>
-          <xsd:documentation>mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--### Verify XML Signature Response ###-->
-  <xsd:element name="VerifyXMLSignatureResponse" type="VerifyXMLSignatureResponseType"/>
-  <xsd:complexType name="VerifyXMLSignatureResponseType">
-    <xsd:sequence>
-      <xsd:element name="SignerInfo" type="dsig:KeyInfoType">
-        <xsd:annotation>
-          <xsd:documentation>only ds:X509Data and ds:RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any; PublicAuthority is included as X509Data/any</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="HashInputData" type="ContentExLocRefBaseType" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="ReferenceInputData" type="ContentExLocRefBaseType" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="SignatureCheck" type="ReferencesCheckResultType"/>
-      <xsd:element name="SignatureManifestCheck" type="ReferencesCheckResultType" minOccurs="0"/>
-      <xsd:element name="XMLDSIGManifestCheck" type="ManifestRefsCheckResultType" minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="CertificateCheck" type="CheckResultType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:simpleType name="ProfileIdentifierType">
-    <xsd:restriction base="xsd:token"/>
-  </xsd:simpleType>
-  <xsd:complexType name="MetaInfoType">
-    <xsd:sequence>
-      <xsd:element name="MimeType" type="MimeTypeType"/>
-      <xsd:element name="Description" type="xsd:anyURI" minOccurs="0"/>
-      <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="FinalDataMetaInfoType">
-    <xsd:complexContent>
-      <xsd:extension base="MetaInfoType">
-        <xsd:sequence>
-          <xsd:element name="Type" type="xsd:anyURI" minOccurs="0"/>
-        </xsd:sequence>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="DataObjectInfoType">
-    <xsd:sequence>
-      <xsd:element name="DataObject">
-        <xsd:complexType>
-          <xsd:complexContent>
-            <xsd:extension base="ContentOptionalRefType"/>
-          </xsd:complexContent>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:choice>
-        <xsd:annotation>
-          <xsd:documentation>Auswahl: Entweder explizite Angabe EINER Transformationskette inklusive ggf. sinnvoller Supplements oder Verweis auf ein benanntes Profil</xsd:documentation>
-        </xsd:annotation>
-        <xsd:element ref="CreateTransformsInfoProfile"/>
-        <xsd:element name="CreateTransformsInfoProfileID" type="ProfileIdentifierType"/>
-      </xsd:choice>
-    </xsd:sequence>
-    <xsd:attribute name="Structure" use="required">
-      <xsd:simpleType>
-        <xsd:restriction base="xsd:string">
-          <xsd:enumeration value="detached"/>
-          <xsd:enumeration value="enveloping"/>
-        </xsd:restriction>
-      </xsd:simpleType>
-    </xsd:attribute>
-  </xsd:complexType>
-  <xsd:complexType name="TransformsInfoType">
-    <xsd:sequence>
-      <xsd:element ref="dsig:Transforms" minOccurs="0"/>
-      <xsd:element name="FinalDataMetaInfo" type="FinalDataMetaInfoType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="XMLDataObjectAssociationType">
-    <xsd:sequence>
-      <xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>
-      <xsd:element name="Content" type="ContentRequiredRefType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CMSDataObjectOptionalMetaType">
-    <xsd:sequence>
-      <xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>
-      <xsd:element name="Content" type="CMSContentBaseType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CMSContentBaseType">
-    <xsd:complexContent>
-      <xsd:restriction base="ContentOptionalRefType">
-        <xsd:choice minOccurs="0">
-          <xsd:element name="Base64Content" type="xsd:base64Binary"/>
-        </xsd:choice>
-      </xsd:restriction>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="CheckResultType">
-    <xsd:sequence>
-      <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
-      <xsd:element name="Info" type="AnyChildrenType" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="ReferencesCheckResultType">
-    <xsd:complexContent>
-      <xsd:restriction base="CheckResultType">
-        <xsd:sequence>
-          <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
-          <xsd:element name="Info" type="ReferencesCheckResultInfoType" minOccurs="0"/>
-        </xsd:sequence>
-      </xsd:restriction>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="ReferencesCheckResultInfoType" mixed="true">
-    <xsd:complexContent mixed="true">
-      <xsd:restriction base="AnyChildrenType">
-        <xsd:sequence>
-          <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-          <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>
-        </xsd:sequence>
-      </xsd:restriction>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="ManifestRefsCheckResultType">
-    <xsd:complexContent>
-      <xsd:restriction base="CheckResultType">
-        <xsd:sequence>
-          <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
-          <xsd:element name="Info" type="ManifestRefsCheckResultInfoType"/>
-        </xsd:sequence>
-      </xsd:restriction>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="ManifestRefsCheckResultInfoType" mixed="true">
-    <xsd:complexContent mixed="true">
-      <xsd:restriction base="AnyChildrenType">
-        <xsd:sequence>
-          <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-          <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>
-          <xsd:element name="ReferringSigReference" type="xsd:positiveInteger"/>
-        </xsd:sequence>
-      </xsd:restriction>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <!--########## Error Response ###-->
-  <xsd:element name="ErrorResponse" type="ErrorResponseType">
-    <xsd:annotation>
-      <xsd:documentation>Resultat, falls die Signaturerstellung gescheitert ist</xsd:documentation>
-    </xsd:annotation>
-  </xsd:element>
-  <xsd:complexType name="ErrorResponseType">
-    <xsd:sequence>
-      <xsd:element name="ErrorCode" type="xsd:integer"/>
-      <xsd:element name="Info" type="xsd:string"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <!--########## Auxiliary Types ###-->
-  <xsd:simpleType name="KeyIdentifierType">
-    <xsd:restriction base="xsd:string"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="KeyStorageType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="Software"/>
-      <xsd:enumeration value="Hardware"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="MimeTypeType">
-    <xsd:restriction base="xsd:token"/>
-  </xsd:simpleType>
-  <xsd:complexType name="AnyChildrenType" mixed="true">
-    <xsd:sequence>
-      <xsd:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="XMLContentType" mixed="true">
-    <xsd:complexContent mixed="true">
-      <xsd:extension base="AnyChildrenType">
-        <xsd:attribute ref="xml:space" use="optional"/>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="ContentBaseType">
-    <xsd:choice minOccurs="0">
-      <xsd:element name="Base64Content" type="xsd:base64Binary"/>
-      <xsd:element name="XMLContent" type="XMLContentType"/>
-      <xsd:element name="LocRefContent" type="xsd:anyURI"/>
-    </xsd:choice>
-  </xsd:complexType>
-  <xsd:complexType name="ContentExLocRefBaseType">
-    <xsd:complexContent>
-      <xsd:restriction base="ContentBaseType">
-        <xsd:choice minOccurs="0">
-          <xsd:element name="Base64Content" type="xsd:base64Binary"/>
-          <xsd:element name="XMLContent" type="XMLContentType"/>
-        </xsd:choice>
-      </xsd:restriction>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="ContentOptionalRefType">
-    <xsd:complexContent>
-      <xsd:extension base="ContentBaseType">
-        <xsd:attribute name="Reference" type="xsd:anyURI" use="optional"/>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="ContentRequiredRefType">
-    <xsd:complexContent>
-      <xsd:restriction base="ContentOptionalRefType">
-        <xsd:choice minOccurs="0">
-          <xsd:element name="Base64Content" type="xsd:base64Binary"/>
-          <xsd:element name="XMLContent" type="XMLContentType"/>
-          <xsd:element name="LocRefContent" type="xsd:anyURI"/>
-        </xsd:choice>
-        <xsd:attribute name="Reference" type="xsd:anyURI" use="required"/>
-      </xsd:restriction>
-    </xsd:complexContent>
-  </xsd:complexType>
-  <xsd:complexType name="VerifyTransformsDataType">
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:annotation>
-        <xsd:documentation>Ein oder mehrere Transformationswege können von der Applikation an MOA mitgeteilt werden. Die zu prüfende Signatur hat zumindest einem dieser Transformationswege zu entsprechen. Die Angabe kann explizit oder als Profilbezeichner erfolgen.</xsd:documentation>
-      </xsd:annotation>
-      <xsd:element ref="VerifyTransformsInfoProfile"/>
-      <xsd:element name="VerifyTransformsInfoProfileID" type="xsd:string">
-        <xsd:annotation>
-          <xsd:documentation>Profilbezeichner für einen Transformationsweg</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:choice>
-  </xsd:complexType>
-  <xsd:element name="QualifiedCertificate"/>
-  <xsd:element name="PublicAuthority" type="PublicAuthorityType"/>
-  <xsd:complexType name="PublicAuthorityType">
-    <xsd:sequence>
-      <xsd:element name="Code" type="xsd:string" minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:simpleType name="SignatoriesType">
-    <xsd:union memberTypes="AllSignatoriesType">
-      <xsd:simpleType>
-        <xsd:list itemType="xsd:positiveInteger"/>
-      </xsd:simpleType>
-    </xsd:union>
-  </xsd:simpleType>
-  <xsd:simpleType name="AllSignatoriesType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="all"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CreateSignatureLocationType">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:token">
-        <xsd:attribute name="Index" type="xsd:nonNegativeInteger" use="required"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="TransformParameterType">
-    <xsd:choice minOccurs="0">
-      <xsd:annotation>
-        <xsd:documentation>Die Angabe des Transformationsparameters (explizit oder als Hashwert) kann unterlassen werden, wenn die Applikation von der Unveränderlichkeit des Inhalts der in "Transformationsparamter", Attribut "URI" angegebenen URI ausgehen kann.</xsd:documentation>
-      </xsd:annotation>
-      <xsd:element name="Base64Content" type="xsd:base64Binary">
-        <xsd:annotation>
-          <xsd:documentation>Der Transformationsparameter explizit angegeben.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="Hash">
-        <xsd:annotation>
-          <xsd:documentation>Der Hashwert des Transformationsparameters.</xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element ref="dsig:DigestMethod"/>
-            <xsd:element ref="dsig:DigestValue"/>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:choice>
-    <xsd:attribute name="URI" type="xsd:anyURI" use="required"/>
-  </xsd:complexType>
-  <xsd:element name="CreateSignatureEnvironmentProfile">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="CreateSignatureLocation" type="CreateSignatureLocationType"/>
-        <xsd:element name="Supplement" type="XMLDataObjectAssociationType" minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="VerifyTransformsInfoProfile">
-    <xsd:annotation>
-      <xsd:documentation>Explizite Angabe des Transformationswegs</xsd:documentation>
-    </xsd:annotation>
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element ref="dsig:Transforms" minOccurs="0"/>
-        <xsd:element name="TransformParameter" type="TransformParameterType" minOccurs="0" maxOccurs="unbounded">
-          <xsd:annotation>
-            <xsd:documentation>Alle impliziten Transformationsparameter, die zum Durchlaufen der oben angeführten Transformationskette bekannt sein müssen, müssen hier angeführt werden. Das Attribut "URI" bezeichnet den Transformationsparameter in exakt jener Weise, wie er in der zu überprüfenden Signatur gebraucht wird.</xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="Supplement" type="XMLDataObjectAssociationType"/>
-  <xsd:element name="SupplementProfile" type="XMLDataObjectAssociationType"/>
-  <xsd:element name="CreateTransformsInfoProfile">
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="CreateTransformsInfo" type="TransformsInfoType"/>
-        <xsd:element ref="Supplement" minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-</xsd:schema>
diff --git a/id/server/auth/src/main/webapp/META-INF/MANIFEST.MF b/id/server/auth/src/main/webapp/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..58630c02e
--- /dev/null
+++ b/id/server/auth/src/main/webapp/META-INF/MANIFEST.MF
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+
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 603758fb8..5c729ef19 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -22,6 +22,12 @@
 		<description>Verify identity link coming from security layer</description>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet</servlet-class>
 	</servlet>
+    <servlet>
+        <servlet-name>ProcessInput</servlet-name>
+        <display-name>ProcessInput</display-name>
+        <description>Process user input needed by infobox validators</description>
+        <servlet-class>at.gv.egovernment.moa.id.auth.servlet.ProcessValidatorInputServlet</servlet-class>
+    </servlet>
 	<servlet>
 		<servlet-name>VerifyAuthBlock</servlet-name>
 		<display-name>VerifyAuthBlock</display-name>
@@ -37,9 +43,7 @@
 	<servlet>
 		<servlet-name>AxisServlet</servlet-name>
 		<display-name>Apache-Axis Servlet</display-name>
-		<servlet-class>
-      org.apache.axis.transport.http.AxisServlet
-    </servlet-class>
+		<servlet-class>org.apache.axis.transport.http.AxisServlet</servlet-class>
 	</servlet>
 
 	<!-- JSP servlet -->
@@ -73,9 +77,13 @@
 		<url-pattern>/VerifyIdentityLink</url-pattern>
 	</servlet-mapping>
 	<servlet-mapping>
-		<servlet-name>VerifyAuthBlock</servlet-name>
-		<url-pattern>/VerifyAuthBlock</url-pattern>
+		<servlet-name>ProcessInput</servlet-name>
+		<url-pattern>/ProcessInput</url-pattern>
 	</servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>VerifyAuthBlock</servlet-name>
+        <url-pattern>/VerifyAuthBlock</url-pattern>
+    </servlet-mapping>
 	<servlet-mapping>
 		<servlet-name>ConfigurationUpdate</servlet-name>
 		<url-pattern>/ConfigurationUpdate</url-pattern>
diff --git a/id/server/auth/src/main/webapp/css/mandates.css b/id/server/auth/src/main/webapp/css/mandates.css
new file mode 100644
index 000000000..7b6e550f0
--- /dev/null
+++ b/id/server/auth/src/main/webapp/css/mandates.css
@@ -0,0 +1,57 @@
+/* CSS Document */
+
+.hleft {
+	float: left;
+	width: 50%;
+}
+
+.hright {
+	float: left;
+	width: 49%;
+}
+
+.htitle {
+	padding-top: 15px;
+	clear: both;
+}
+
+.leiste1 {
+	background-color: #FF0000;
+	color: #FFFFFF;
+	font-weight: bold;
+	width: 15%;
+	float: left;
+	clear: left;
+	height: 20px;
+	padding-top: 5px;
+	padding-bottom: 5px;
+  FONT-SIZE: 0.9em;
+}
+
+.leiste2 {
+	background-color: #CCCCCC;
+	color: #000000;
+	float: left;
+	height: 20px;
+	width: 33%;
+	padding-top: 5px;
+	padding-bottom: 5px;
+}
+
+a.info {
+	color: #000000;
+	text-decoration: underline;
+}
+
+
+.leiste3 {
+	background-color: #CCCCCC;
+	color: #000000;
+	height: 20px;
+	float: left;
+	width: 17%;
+	padding-top: 5px;
+	padding-bottom: 5px;
+  FONT-SIZE: 0.8em;
+
+}	
diff --git a/id/server/auth/src/main/webapp/css/styles.css b/id/server/auth/src/main/webapp/css/styles.css
new file mode 100644
index 000000000..d91b993d1
--- /dev/null
+++ b/id/server/auth/src/main/webapp/css/styles.css
@@ -0,0 +1,741 @@
+/*
+|| Groesse der Seite auf A4 setzen
+|| Rand auf jeweils 10% der Seite setzen
+*/
+
+@page {
+  size: 21cm 29.7cm;
+  margin: 10%;
+}
+
+/*
+|| Font und Farben, die fuer das gesamte Dokument gueltig sind.
+*/
+
+body {
+  font-family: arial, helvetica, sans-serif;
+  background-color: white;
+  color: black;
+}
+
+/*
+|| Eingabefelder verwenden eine Monospace-Font (s. Laenderstyleguide 5.1)
+*/
+
+input, textarea, select {
+  font-family: monospace;
+}
+
+/*
+|| Schriftgroesse fuer Formulartitel
+*/
+
+h1 {
+  font-size: 1.3em;
+}
+
+/*
+|| Definitionen fuer die Kategorien (faerbiger Balken)
+*/
+
+h2 {
+  width: 98%;
+  background-color: #A02D2D;
+  color: white;
+  font-weight: bold;
+  font-size: 1em;
+  padding: 0.3em;
+  border-width: thin;
+  margin-bottom: 1em;
+}
+
+/*
+|| Subkategorie (zB Adresse innerhalb von Stammgewerbeberechtigung)
+*/
+
+h3 {
+  padding: 5px;
+  margin-bottom: 1px;
+  font-size: 0.8em;
+}
+
+/*
+|| Informationstext zu einer Kategorie
+*/
+
+h4 {
+  margin-bottom: 0.5em;
+  font-size: 0.8em;
+}
+
+fieldset {
+  border: none;
+}
+
+}
+
+legend {
+  display: none;
+}
+
+
+/*
+|| Informationstext im Info-Kaestchen
+*/
+
+.infotext {
+  padding: 0.8em;
+  float: left;
+  background-color: #EEEEEE;
+  color: black;
+  font-size: 0.8em;
+}
+
+/*
+|| Info-Link im Info-Kaestchen
+*/
+
+.infobutton {
+  float: left;
+  width: 2em;
+  background-color: red;
+  text-align: center;
+  font-size: 1.5em;
+  color: white;
+  font-weight: bold;
+  padding: 0.4em;
+  border-width: 0.25em;
+  border-style: outset;
+  border-style: -moz-bg-outset;
+}
+
+/*
+|| Info-Link soll weiss sein
+*/
+
+.infobutton a:link {
+ 	background-color: red;
+	color: white;
+  text-decoration: none;
+
+}
+
+/*
+|| Info-Link soll weiss sein, auch wenn Link schon einmal angeklickt wurde
+*/
+
+.infobutton a:visited {
+	background-color: red;
+	color: white;
+}
+
+/*
+|| Info-Link-Text soll weiss sein, auch wenn man mit der Maus drueberfaehrt
+*/
+
+.infobutton a:hover {
+	background-color: red;
+	color: white;
+}
+
+/*
+|| Begrenzung fuer das Info-Kaestchen
+*/
+
+.boundinginfobox {
+  width: 99%;
+  background-color: #EEEEEE;
+  color: black;
+  border-width: thin;
+}
+
+/*
+|| Begrenzung fuer Eingabefeldbereiche
+*/
+
+.boundingbox {
+  width: 99%;
+  background-color: #EEEEEE;
+  color: black;
+  border-width: thin;
+  margin-bottom: 1em;
+}
+
+/*
+|| Begrenzung, die Leittexte und Formulardaten im statischen Formular
+|| zusammenhaelt, sodass es bei einem Seitenumbruch beim Ausdruck
+|| nicht zu Verschiebungen kommt
+*/
+.printboundingbox {
+  width: 99%;
+}
+
+/*
+|| Bereich fuer die Leittexte
+*/
+
+.labelarea {
+  text-align: right;
+  width: 17%;
+  float: left;
+  padding: 5px;
+  font-size: 0.8em;
+  vertical-align: middle;
+}
+
+/*
+|| Bereich fuer sehr lange Leittexte
+*/
+
+.labelareawidened {
+  text-align: right;
+  width: 50%;
+  float: left;
+  padding: 5px;
+  font-size: 0.8em;
+  vertical-align: middle;
+}
+
+/*
+|| Leittextbereich ohne Angabe einer Breite (z.B. bei Stiege und Tuer; sonst generell (.labelarea) 17% der Gesamtbreite)
+*/
+
+.labelareanowidth {
+  float: left;
+  padding: 5px;
+  font-size: 0.8em;
+  vertical-align: middle;
+}
+
+/*
+|| Legendenbereich (Icons)
+*/
+
+.legendarea {
+  width: 30px;
+  text-align: left;
+  float: left;
+  padding-left: 4px;
+  padding-top: 5px;
+  vertical-align: middle;
+}
+
+/*
+|| Legendenbereich fuer den Stern (in Kombination mit einem Rufzeichen)
+*/
+
+.legendareastar {
+  width: 13px;
+  float: left;
+  padding-left: 4px;
+  padding-top: 5px;
+  vertical-align: middle;
+}
+
+/*
+|| Legendenbereich fuer das Info-Icon
+*/
+
+.legendareainfo {
+  width: 17px;
+  float: left;
+  padding-top: 5px;
+  vertical-align: middle;
+}
+
+/*
+|| Bereich fuer ein einzelnes Eingabefeld
+*/
+
+.inputfieldarea {
+  float: left;
+  padding: 4px;
+}
+
+/*
+|| Bereich fuer das erste Eingabefeld, wenn zwei in einer Zeile
+|| = Eingabefeldbereich, dessen Breite auf 26% begrenzt ist (.inputfieldarea hat keine Begrenzung)
+*/
+
+.inputfieldareafortwo {
+  width: 26%;
+  float: left;
+  padding: 4px;
+}
+
+
+/*
+|| e-Goverment Schriftzug im Logo
+*/
+
+.egovlogo {
+  text-align: center;
+  background-color: white;
+  color: #008B8B;
+  font-weight: bold;
+  font-style: italic;
+  font-size: 1.7em;
+}
+
+/*
+|| help.gv.at-Schriftzug im Logo
+*/
+
+.egovtext {
+  text-align: center;
+  background-color: white;
+  color: black;
+  font-weight: bold;
+  font-size: 1.2em;
+}
+
+/*
+|| Bereich fuer den Titel des Formulars links vom Logo
+*/
+
+.titlebox {
+  float: left;
+  width: 65%;
+  margin-bottom: 1em;
+}
+
+/*
+|| Bereich fuer das Logo
+*/
+
+.logobox {
+  float: right;
+  margin-bottom: 1em;
+}
+
+/*
+|| Allgemeiner Informationstext zu einem Formular (zwischen Formulartitel
+|| und Info-Kaestchen
+*/
+
+.introtext {
+  font-weight: bold;
+  margin-bottom: 1em;
+}
+
+/*
+|| Link "Zum Formularanfang"
+*/
+
+.formtop {
+  float: right;
+}
+
+/*
+|| Bereich fuer die Steuerungs-Buttons (Senden, Abbrechen, etc.)
+*/
+
+.buttonarea {
+  margin-top: 0.5em;
+  text-align: center;
+}
+
+/*
+|| Aussehen der Steuerungs-Buttons
+*/
+
+.button {
+  font-family: arial, helvetica, sans-serif;
+  font-size: 1em;
+}
+
+/*
+|| Formularkennung/Fusszeile des Formulars
+*/
+
+.formid {
+  float: left;
+  font-style: italic;
+  font-size: 0.8em;
+  background-color: #008B8B;
+  color: white;
+  padding: 0.5em;
+}
+
+/*
+|| Behoerdenanschrift
+*/
+
+.organizationaddress {
+  font-style: italic;
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+/*
+|| Behoerdenanschrift mit Logo
+*/
+
+.organizationaddresslogo {
+  font-style: italic;
+  margin-top: 1em;
+  margin-bottom: 1em;
+  float: left;
+}
+
+/*
+|| Beilagen-Tabelle
+*/
+
+.attachmenttable {
+  width: 99%;
+  background-color: #EEEEEE;
+  color: black;
+  border-width: thin;
+  border-collapse: collapse;
+  margin-bottom: 1em;
+}
+
+/*
+|| Spaltenueberschrift "lfd Nr"
+*/
+
+.attachmenttitlenumber  {
+	border-bottom: thin solid black;
+	border-right: thin solid black;
+	padding: 0.3em;
+	font-size: 0.8em;
+}
+
+/*
+|| Spaltenueberschrift "Beilage"
+*/
+
+.attachmenttitlename {
+	border-bottom: thin solid black;
+	border-right: thin solid black;
+	padding: 0.5em;
+	text-align: left;
+	font-size: 0.8em;
+}
+
+
+/*
+|| Spaltenueberschriften "nachgereicht" und "angefuegt"
+*/
+
+.attachmenttitleselection {
+	padding: 0.3em;
+	text-align: center;
+	border-left: thin solid black;
+	border-bottom: thin solid black;
+	font-size: 0.8em;
+}
+
+/*
+|| Spaltenueberschrift "Datei"
+*/
+
+.attachmenttitlefile {
+	padding: 0.3em;
+	text-align: left;
+	border-bottom: thin solid black;
+	font-size: 0.8em;
+}
+
+/*
+|| Zellen der Spalte "lfd Nr"
+*/
+
+.attachmentnumber {
+	text-align: center;
+	border-left: thin solid #EEEEEE;
+	border-right: thin solid black;
+	padding: 0.3em;
+	font-size: 0.8em;
+}
+
+/*
+|| Zellen der Spalte "Beilage"
+*/
+
+.attachmentname {
+	text-align: left;
+	border-left: thin solid black;
+	border-right: thin solid black;
+	padding: 0.5em;
+	font-size: 0.8em;
+}
+
+/*
+|| Zellen der Spalte "Datei"
+*/
+
+.attachmentfile {
+	text-align: left;
+	border-right: thin solid #EEEEEE;
+	padding: 0.3em;
+}
+
+/*
+|| Zellen der Spalte "angefuegt"
+*/
+
+.attachmentselectiononline {
+	text-align: center;
+	padding: 0.3em;
+  border-left: solid black thin;
+}
+
+/*
+|| Zellen der Spalte "nachgereicht"
+*/
+
+.attachmentselectionpost {
+	text-align: center;
+	border-left: solid black thin;
+	padding: 0.3em;
+}
+
+/*
+|| unsichtbarer Bereich
+*/
+
+.hide {
+	visibility: hidden;
+	display: none;
+}
+
+/*
+|| sichtbarer Bereich
+*/
+
+.show {
+	visibility: visible;
+	display: block;
+}
+
+/*
+|| readonly-Felder
+*/
+
+.deactive {
+  background-color: #D3D3D3;
+  color: gray;
+}
+
+/*
+|| Fehlertexte (bei fehlerhaften Eingaben)
+*/
+
+.errortext {
+  color: red;
+  background-color: white;
+  font-size: 1em;
+  border: solid red 2px;
+  padding: 0.5em;
+  width: 97%;
+}
+
+.errortext a:visited , .errortext a:link, .errortext a:hover {
+	color: red;
+}
+
+/*
+|| simuliertes Readonly-Eingabefeld, das in Wirklichkeit
+|| Text mit einem Rahmen ist
+*/
+
+.readonlybutton {
+  width: 20em;
+  background-color: #D3D3D3;
+  color: gray;
+  border-color: gray;
+  border-width: thin;
+  border-style: inset;
+  font-family: monospace;
+}
+
+/*
+|| Vertikale Ausrichtung des Info-Icons im Beilagenbereich
+*/
+
+.imagevertalign {
+  vertical-align: middle;
+}
+
+/*
+|| Unterbindet Rahmen bei Bildern mit hinterlegtem Link
+*/
+
+a img {
+  border: none;
+}
+
+/*
+|| MOA-Ergebnis-Tabelle
+*/
+
+.MOA-SP-ergebnis-tabelle {
+	width: 100%;
+	border: thin solid black;
+	border-collapse: collapse;
+	margin-bottom: 1em;
+}
+
+/*
+|| MOA-Ergebnis-Tabellenemelemente
+*/
+
+.MOA-SP-ergebnis-zelle, .MOA-SP-ergebnis-header {
+	border: thin solid black;
+	text-align: left;
+	padding: 0.3em;
+	background-color: #EEEEEE;
+}
+
+/*
+|| MOA-Ergebnis-Tabelle Fehlermeldungen
+*/
+
+.moa-sp-error {
+	color: red;
+	font-weight: bold;
+}
+
+/*
+|| Signaturblock-Tabelle
+*/
+
+.sigblock-tabelle {
+	width: 100%;
+	border: thin solid black;
+	border-collapse: collapse;
+	margin-bottom: 1em;
+}
+
+/*
+|| Signaturblock-Tabellenelemente
+*/
+
+.sigblock-zelle, .sigblock-header {
+	border: thin solid black;
+	text-align: left;
+	padding: 0.3em;
+	background-color: #EEEEEE;
+}
+
+/*
+|| Formular mit mehreren Seiten, Angabe der aktuellen Seite
+*/
+
+.steps {
+	text-align: right;
+	font-weight: bold;
+	padding: 0.3em;
+	margin-right: 0.3em;
+	font-style: italic;
+}
+
+/*
+|| Bereich fuer Formularliste
+*/
+
+.labelareaform {
+  text-align: left;
+  width: 50%;
+  float: left;
+  padding: 5px;
+  font-size: 0.8em;
+  font-weight: bold;
+  vertical-align: middle;
+}
+
+/*
+|| Bereich fuer Bestellung und Details bei Formularbestellungen
+*/
+
+.labelareaorderdetail {
+  text-align: center;
+  width: 17%;
+  float: left;
+  padding: 5px;
+  font-size: 0.8em;
+  vertical-align: middle;
+  font-weight: bold;
+}
+
+/*
+|| Farbe der Verfahrens-Tabellenzeilen mit geradem Index
+*/
+
+.evenformrow {
+	background-color: #EEEEEE;
+}
+
+/*
+|| Farbe der Verfahrens-Tabellenzeilen mit ungeradem Index
+*/
+
+.oddformrow {
+	background-color: lightgrey;
+}
+
+/*
+|| Sicherheitsabfrage in der Verfahrensverwaltung
+*/
+
+.checktext {
+	color: red;
+	padding: 0.5em;
+	border: solid 2px red;
+	margin: 1em;
+}
+
+/*
+|| Buttons der Eingangsstelle
+*/
+
+.eingang_button {
+	line-height: 2em;
+	border-width: 2px;
+	border-color: grey;
+	padding: 4px;
+	background-color: lightgrey;
+	border-style: outset;
+	border-style: -moz-bg-outset;
+}
+
+/*
+|| Buttonlinks der Eingangsstelle
+*/
+
+.eingang_button_link {
+	color: black;
+	text-decoration: none;
+}
+
+/*
+|| Für den Farbenwechsel bei den Beilagen-Tabellen
+*/
+
+table.attachmenttable tr.s
+{ 
+  background-color: lightgrey;
+}
+
+/*
+|| Farbe der Titelzeile bei den Beilagen-Tabellen
+*/
+
+table.attachmenttable thead
+{ 
+  background-color: #aaaaaa;
+}
+
+/*
+|| Aktuell fokussiertes Eingabefeld visuell hervorheben (Styleguide Anforderung)
+*/
+
+input:focus, input.field:focus, select:focus, textarea:focus {
+   border: 2px solid black;
+}
+   
+select:focus {
+   background-color: #FFFFFE;
+} 
\ No newline at end of file
diff --git a/id/server/auth/src/main/webapp/css/styles_opera.css b/id/server/auth/src/main/webapp/css/styles_opera.css
new file mode 100644
index 000000000..a2ea527bf
--- /dev/null
+++ b/id/server/auth/src/main/webapp/css/styles_opera.css
@@ -0,0 +1,11 @@
+/*
+|| In Opera funktioniert das Aus- und Einblenden von HTML-Bloecken
+|| mittels JavaScript-Zugriff auf DOM-Objekte nicht, daher muss
+|| die Definition der Klasse .hide in diesem Browser durch eine
+|| "sichtbare" Definition ueberlagert werden
+*/
+
+.hide {
+	visibility: visible;
+	display: block;
+}
\ No newline at end of file
diff --git a/id/server/auth/src/main/webapp/img/egov_schrift.gif b/id/server/auth/src/main/webapp/img/egov_schrift.gif
new file mode 100644
index 000000000..aea64ef5e
Binary files /dev/null and b/id/server/auth/src/main/webapp/img/egov_schrift.gif differ
diff --git a/id/server/auth/src/main/webapp/img/info.gif b/id/server/auth/src/main/webapp/img/info.gif
new file mode 100644
index 000000000..f9e1bb00f
Binary files /dev/null and b/id/server/auth/src/main/webapp/img/info.gif differ
diff --git a/id/server/auth/src/main/webapp/img/rufezeichen.gif b/id/server/auth/src/main/webapp/img/rufezeichen.gif
new file mode 100644
index 000000000..fbad8d758
Binary files /dev/null and b/id/server/auth/src/main/webapp/img/rufezeichen.gif differ
diff --git a/id/server/auth/src/main/webapp/img/stern.gif b/id/server/auth/src/main/webapp/img/stern.gif
new file mode 100644
index 000000000..77c53d1c3
Binary files /dev/null and b/id/server/auth/src/main/webapp/img/stern.gif differ
diff --git a/id/server/auth/src/main/webapp/javascript/fa.js b/id/server/auth/src/main/webapp/javascript/fa.js
new file mode 100644
index 000000000..ffa4031b1
--- /dev/null
+++ b/id/server/auth/src/main/webapp/javascript/fa.js
@@ -0,0 +1,8 @@
+function deactivateApplicant( ) {
+	if ( document.formular.familienname.value != '' )
+		toggleActive( document.formular.familienname, 'deactive' );
+	if ( document.formular.vorname.value != '' )
+		toggleActive( document.formular.vorname, 'deactive' );
+	if ( document.formular.geburtsdatum.value != '' && document.formular.geburtsdatum.value != 'JJJJ-MM-TT' )
+		toggleActive( document.formular.geburtsdatum, 'deactive' );
+}
diff --git a/id/server/auth/src/main/webapp/javascript/formallg.js b/id/server/auth/src/main/webapp/javascript/formallg.js
new file mode 100644
index 000000000..65d7bbedf
--- /dev/null
+++ b/id/server/auth/src/main/webapp/javascript/formallg.js
@@ -0,0 +1,315 @@
+/*
+|| Die Funktion displayElement() macht ein verstecktes HTML-Element sichtbar.
+|| Das HTML-Element ist in aller Regel ein mit <div> ... </div> umspannter
+|| HTML-Abschnitt.
+||
+|| IN-Parameter: element_id ... ID des sichtbarzumachenden HTML-Elements
+||
+*/
+
+function displayElement( element_id ) {
+	if ( notNN4( ) )
+	{
+		var elementToDisplay = document.getElementById( element_id );
+		elementToDisplay.className = 'show';
+	}
+}
+
+
+
+/*
+|| Die Funktion hideElement() macht ein HTML-Element unsichtbar.
+|| Das HTML-Element ist in aller Regel ein mit <div> ... </div> umspannter
+|| HTML-Abschnitt.
+||
+|| IN-Parameter: element_id ... ID des zu versteckenden HTML-Elements
+||
+*/
+
+function hideElement( element_id ) {
+	if ( notNN4( ) )
+	{
+		var elementToHide = document.getElementById( element_id );
+		elementToHide.className = 'hide';
+	}
+}
+
+
+
+/*
+|| Die Funktion resetValue() setzt Radiobuttons, Dropdown-Menues und Checkboxes auf ihre
+|| Ausgangswerte (beim Laden des Formulars) zurueck.
+||
+|| IN-Parameter: element ... Radiobutton-, Dropdown- oder Checkbox-Element
+||
+*/
+
+function resetValue( element ) {
+	for ( var i = 0; i < element.length; i++ )
+	{
+		element[i].checked = element[i].defaultChecked;
+		element[i].selected = element[i].defaultSelected;
+	}
+}
+
+
+
+/*
+|| Die Funktion toggleDisplay() invertiert die Sichtbarkeit eines
+|| HTML-Elements.
+|| Das HTML-Element ist in aller Regel ein mit <div> ... </div> umspannter
+|| HTML-Abschnitt.
+||
+|| IN-Parameter: element_id ... ID des zu invertierenden HTML-Elements
+||
+*/
+
+function toggleDisplay( element_id ) {
+	if ( notNN4( ) )
+	{
+		var elementToToggle = document.getElementById( element_id );
+		var elementClass = elementToToggle.className;
+		if ( elementClass == 'hide' )
+			elementToToggle.className = "display";
+		else
+			elementToToggle.className = "hide";
+	}
+}
+
+/*
+|| Die Funktion toggleActive() setzt das Attribut 'readonly' eines
+|| HTML-Eingabeelements.
+||
+|| IN-Parameter: element ... HTML-Eingabeelement
+|| IN-Parameter: status ... entweder 'active' oder 'deactive'
+||
+*/
+
+function toggleActive( element, status ) {
+
+	if ( notNN4( ) )
+	{
+ 		var elementToToggle = document.getElementById( element.id );
+
+ 		if ( status == 'active' )
+ 		{
+ 			element.readOnly = false;
+ 			elementToToggle.className = "active";
+ 		}
+ 		else
+ 		{
+ 			element.readOnly = true;
+ 			elementToToggle.className = "deactive";
+ 		}
+	}
+}
+
+
+
+/*
+|| Die Funktion changeActivity() setzt das Attribut 'readonly' eines
+|| HTML-Eingabeelements in Abhaengigkeit des Uebergabeparameters 'value'.
+||
+|| IN-Parameter: value ... Wert eines HTML-Eingabelements
+|| IN-Parameter: element ... HTML-Eingabeelement
+||
+*/
+
+function changeActivity( value, element ) {
+	if ( value == null || value == '' )
+		toggleActive( element, 'active' );
+	else
+		toggleActive( element, 'deactive' );
+}
+
+
+
+/*
+|| Die Funktion pasteValueAndDeactivate() setzt den Wert eines HTML-Eingabeelements
+|| und setzt das Attribut 'readonly', je nachdem ob der uebergebene Wert ungleich
+|| dem Leerstring ist oder nicht.
+||
+|| IN-Parameter: value ... zu setzender Wert
+|| IN-Parameter: element ... HTML-Eingabeelement
+||
+*/
+
+function pasteValueAndDeactivate( value, element ) {
+	if ( notNN4( ) )
+	{
+		var elementToSet = document.getElementById( element.id );
+		elementToSet.value = value;
+		if ( value != null && value != '' )
+		{
+			element.readOnly = true;
+			elementToSet.className = "deactive";
+		}
+		else
+		{
+			element.readOnly = false;
+			elementToSet.className = "active";
+		}
+	}
+}
+
+
+
+/*
+|| Die Funktion popitup() oeffnet im Browser links oben ein Fenster
+|| mit bestimmten Eigenschaften (keine Statuszeile, kein Browsermenue, etc.).
+|| URL und Groesse des Fensters werden als Parameter uebergeben.
+||
+|| IN-Parameter: url ... in dem Fenster zu oeffnende URL
+|| IN-Parameter: win_width ... Breite des zu oeffnenden Fensters
+|| IN-Parameter: win_height ... Hoehe des zu oeffnenden Fensters
+||
+*/
+
+function popitup( url, win_width, win_height ) {
+	var features = "resizable, scrollbars=yes,status=no, menubar=no, toolbar=no, screenX=20, screenY=20, width=" + win_width + ", height=" + win_height;
+	newwindow=window.open( url, 'Info', features );
+	/* die folgende Anweisung verursacht im IE eine Zugriffsverletzung, daher auskommentiert! */
+	// newwindow.moveTo( 20, 20);
+	if ( window.focus )
+		newwindow.focus( );
+}
+
+
+
+/*
+|| Die Funktion initialize() deaktiviert das StyleSheet styles_opera.css (ausser fuer Opera).
+|| Ausserdem werden in Browsern, die JavaScript aktiviert haben, die Icon-Info-Links durch href-Werte ersetzt,
+|| die kein neues Browser-Fenster, sondern ein kleines Fenster oeffnen (s. Funktion javascriptWindows).
+|| Der Parameter url hat entweder den Wert http://www.help.gv.at/formulare/infotexte/ oder
+|| http://e-www.help.gv.at/linkdb/formulare/infotexte/, je nachdem in welcher Umgebung man sich befindet
+*/
+
+function initialize( url ) {
+	if ( notNN4( ) ) {
+            if (document.getElementsByTagName) {
+                  if ( document.getElementsByTagName('link').length > 1 )
+			{
+				document.getElementsByTagName('link')[1].disabled = true;
+				javascriptWindows( url );
+			}
+		  schattieren( );
+		}
+      }
+}
+
+
+/*
+|| Die Funktion javascriptWindows() ersetzt in den Formularen bei aktiviertem JavaScript
+|| die Links bei den Infobuttons durch window.open-Befehle, so dass diese Infotexte in
+|| einem kleinen Fenster im Browser links oben geoeffnet werden.
+|| Der Parameter url hat entweder den Wert http://www.help.gv.at/formulare/infotexte/ oder
+|| http://e-www.help.gv.at/linkdb/formulare/infotexte/, je nachdem in welcher Umgebung man sich befindet.
+*/
+
+function javascriptWindows( url ) {
+	var aElement,
+	    href,
+	    newHref,
+	    lastIndex;
+	if ( notNN4( ) )
+	{
+		for ( var i = 0; i < document.getElementsByTagName( 'a' ).length; i++ )
+		{
+			aElement = document.getElementsByTagName( 'a' )[i];
+			href = aElement.href;
+			if ( href.indexOf( 'info_' ) != -1 )
+			{
+				lastIndex = href.lastIndexOf( '/' );
+				newHref = href.substring( lastIndex + 1 );
+				newHref = "javascript:popitup('" + url + newHref + "',660,500);";
+				aElement.setAttribute( 'href', newHref );
+				aElement.setAttribute( 'target', '_self' );
+			}
+		}
+	}
+}
+
+/*
+|| Die Funktion submitButton() erzeugt einen Submit-Button, der ein automatisches
+|| Abschicken verhindert, wenn der User in einem Eingabefeld die Return-Taste
+|| betaetigt.
+|| Wurde durch die Funktion generateButton() abgeloest.
+*/
+
+function submitButton( ) {
+  document.writeln('<input type="button" name="JavaScriptButton" value="Senden" class="button" ' +
+                   'onclick="document.formular.Senden.value=\'Senden\'; document.formular.submit()" ' +
+                   'onkeypress="document.formular.Senden.value=\'Senden\'; document.formular.submit()" />');
+}
+
+/*
+|| Die Funktion cancelButton() erzeugt einen Abbrechen-Button, der ein automatisches
+|| Abschicken verhindert, wenn der User in einem Eingabefeld die Return-Taste
+|| betaetigt.
+|| Wurde durch die Funktion generateButton() abgeloest.
+*/
+
+function cancelButton( ) {
+  document.writeln('<input type="button" name="JavaScriptButton" value="Abbrechen" class="button" ' +
+                   'onclick="document.formular.Senden.value=\'Abbrechen\'; document.formular.submit()" ' +
+                   'onkeypress="document.formular.Senden.value=\'Abbrechen\'; document.formular.submit()" />');
+}
+
+/*
+|| Die Funktion generateButton() erzeugt einen Button, der ein automatisches
+|| Abschicken verhindert, wenn der User in einem Eingabefeld die Return-Taste
+|| betaetigt. Die Art des Buttons wird durch den uebergebenen Wert bestimmt.
+|| Moegliche Werte: Senden, Abbrechen, Signieren, etc.
+*/
+
+function generateButton( kind ) {
+
+  document.write('<input type="button" name="JavaScriptButton" value="' + kind + '" class="button" ' +
+                   'onclick="' );
+  if ( kind == 'Druckversion' )
+    document.write( 'document.formular.target=\'_blank\' ;' );
+  else
+    document.write( 'document.formular.target=\'_self\' ; ' );
+  document.write( 'document.formular.Senden.value=\'' + kind + '\'; document.formular.submit()" ' +
+                   'onkeypress="' );
+  if ( kind == 'Druckversion' )
+    document.write( 'document.formular.target=\'_blank\'; ' );
+  else
+    document.write( 'document.formular.target=\'_self\';' );
+  document.writeln( 'document.formular.Senden.value=\'' + kind + '\'; document.formular.submit()" />');
+
+}
+
+/*
+|| Die Funktion NN4 testet, ob es sich bei dem Browser um einen Netscape
+|| Navigator der Version 4 handelt.
+*/
+
+function notNN4( ) {
+	return ( ! document.layers );
+}
+
+/*
+|| Die Funktion schattieren setzt in den Beilagen-Tabellen abwechselnd Farben
+|| Quelle: Andreas Borutta, http://borumat.de/html/tab-schattieren.php
+*/
+
+
+function schattieren () {
+var tabelle=document.getElementsByTagName("table");
+  for(i=0; i<=tabelle.length-1; i++) {
+    var klasse=tabelle[i].className;
+    var pos1=klasse.indexOf("attachmenttable");
+    if (pos1 > -1) {
+      pos1=klasse.indexOf("ab_");
+      if (pos1 > -1 ) var von=parseInt(klasse.substr(pos1+3,2));
+      else var von=3;
+      var pos2=klasse.indexOf("fuss_");
+      if (pos2 > -1 ) var fuss=parseInt(klasse.substr(pos2+5,2));
+      else var fuss=0;
+      var reihe=tabelle[i].getElementsByTagName("tr");
+      for (j=von -1; j<=reihe.length -fuss -1; j=j+2)
+        reihe[j].className="s";
+    } //endIf
+  } //endFor
+} //endFunc
diff --git a/id/server/auth/src/main/wsdl/MOA-ID-1.0.wsdl b/id/server/auth/src/main/wsdl/MOA-ID-1.0.wsdl
new file mode 100644
index 000000000..5751b3e58
--- /dev/null
+++ b/id/server/auth/src/main/wsdl/MOA-ID-1.0.wsdl
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name="MOA" targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:xsd="http://www.w3.org/1999/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl/">
+	<import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" location="MOA-20020812.xsd"/>
+	<message name="GetAuthenticationDataInput">
+		<part name="body" element="samlp:Request"/>
+	</message>
+	<message name="GetAuthenticationDataOutput">
+		<part name="body" element="samlp:Response"/>
+	</message>
+	<message name="MOAFault">
+		<part name="body" element="moa:ErrorResponse"/>
+	</message>
+	<portType name="IdentificationPortType">
+		<operation name="getAuthenticationData">
+			<input message="tns:GetAuthenticationDataInput"/>
+			<output message="tns:GetAuthenticationDataOutput"/>
+			<fault name="MOAFault" message="tns:MOAFault"/>
+		</operation>
+	</portType>
+	<binding name="IdentificationBinding" type="tns:IdentificationPortType" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/soap/ http://schemas.xmlsoap.org/wsdl/soap/">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<operation name="getAuthenticationData">
+			<soap:operation soapAction="urn:GetAuthenticationDataAction"/>
+			<input>
+				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
+			</output>
+			<fault name="MOAFault">
+				<soap:fault name="MOAFault" use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
+			</fault>
+		</operation>
+	</binding>
+	<service name="GetAuthenticationDataService">
+		<port name="IdentificationPort" binding="tns:IdentificationBinding">
+			<soap:address location="http://localhost/moa-id-auth/services/GetAuthenticationData"/>
+		</port>
+	</service>
+</definitions>
diff --git a/id/server/auth/src/main/wsdl/MOA-ID-1.x.wsdl b/id/server/auth/src/main/wsdl/MOA-ID-1.x.wsdl
new file mode 100644
index 000000000..5466a0b6f
--- /dev/null
+++ b/id/server/auth/src/main/wsdl/MOA-ID-1.x.wsdl
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name="MOA" targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:xsd="http://www.w3.org/1999/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl/">
+	<import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" location="MOA-SPSS-1.2.xsd"/>
+	<message name="GetAuthenticationDataInput">
+		<part name="body" element="samlp:Request"/>
+	</message>
+	<message name="GetAuthenticationDataOutput">
+		<part name="body" element="samlp:Response"/>
+	</message>
+	<message name="MOAFault">
+		<part name="body" element="moa:ErrorResponse"/>
+	</message>
+	<portType name="IdentificationPortType">
+		<operation name="getAuthenticationData">
+			<input message="tns:GetAuthenticationDataInput"/>
+			<output message="tns:GetAuthenticationDataOutput"/>
+			<fault name="MOAFault" message="tns:MOAFault"/>
+		</operation>
+	</portType>
+	<binding name="IdentificationBinding" type="tns:IdentificationPortType" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/soap/ http://schemas.xmlsoap.org/wsdl/soap/">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<operation name="getAuthenticationData">
+			<soap:operation soapAction="urn:GetAuthenticationDataAction"/>
+			<input>
+				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
+			</output>
+			<fault name="MOAFault">
+				<soap:fault name="MOAFault" use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
+			</fault>
+		</operation>
+	</binding>
+	<service name="GetAuthenticationDataService">
+		<port name="IdentificationPort" binding="tns:IdentificationBinding">
+			<soap:address location="http://localhost/Identification"/>
+		</port>
+	</service>
+</definitions>
diff --git a/id/server/auth/src/main/wsdl/MOA-SPSS-1.2.xsd b/id/server/auth/src/main/wsdl/MOA-SPSS-1.2.xsd
new file mode 100644
index 000000000..d7a06d6e7
--- /dev/null
+++ b/id/server/auth/src/main/wsdl/MOA-SPSS-1.2.xsd
@@ -0,0 +1,454 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  MOA SP/SS 1.2 Schema
+-->
+<xsd:schema targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.2">
+  <xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
+  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+  <!--########## Create XML Signature ###-->
+  <!--### Create XML Signature Request ###-->
+  <xsd:element name="CreateXMLSignatureRequest">
+    <xsd:complexType>
+      <xsd:complexContent>
+        <xsd:extension base="CreateXMLSignatureRequestType"/>
+      </xsd:complexContent>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:complexType name="CreateXMLSignatureRequestType">
+    <xsd:sequence>
+      <xsd:element name="KeyIdentifier" type="KeyIdentifierType"/>
+      <xsd:element name="SingleSignatureInfo" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>Ermöglichung der Stapelsignatur durch wiederholte Angabe dieses Elements</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="DataObjectInfo" maxOccurs="unbounded">
+              <xsd:complexType>
+                <xsd:complexContent>
+                  <xsd:extension base="DataObjectInfoType">
+                    <xsd:attribute name="ChildOfManifest" type="xsd:boolean" use="optional" default="false"/>
+                  </xsd:extension>
+                </xsd:complexContent>
+              </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="CreateSignatureInfo" minOccurs="0">
+              <xsd:complexType>
+                <xsd:sequence>
+                  <xsd:element name="CreateSignatureEnvironment" type="ContentOptionalRefType"/>
+                  <xsd:choice>
+                    <xsd:annotation>
+                      <xsd:documentation>Auswahl: Entweder explizite Angabe des Signaturorts sowie ggf. sinnvoller Supplements im Zshg. mit der Signaturumgebung, oder Verweis auf ein benanntes Profil</xsd:documentation>
+                    </xsd:annotation>
+                    <xsd:element ref="CreateSignatureEnvironmentProfile"/>
+                    <xsd:element name="CreateSignatureEnvironmentProfileID" type="ProfileIdentifierType"/>
+                  </xsd:choice>
+                </xsd:sequence>
+              </xsd:complexType>
+            </xsd:element>
+          </xsd:sequence>
+          <xsd:attribute name="SecurityLayerConformity" type="xsd:boolean" use="optional" default="true"/>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+  <!--### Create XML Signature Response ###-->
+  <xsd:complexType name="CreateXMLSignatureResponseType">
+    <xsd:choice maxOccurs="unbounded">
+      <xsd:annotation>
+        <xsd:documentation>Kardinalität 1..oo erlaubt die Antwort auf eine Stapelsignatur-Anfrage</xsd:documentation>
+      </xsd:annotation>
+      <xsd:element name="SignatureEnvironment">
+        <xsd:annotation>
+          <xsd:documentation>Resultat, falls die Signaturerstellung erfolgreich war</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:any namespace="##any" processContents="lax"/>
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element ref="ErrorResponse"/>
+    </xsd:choice>
+  </xsd:complexType>
+  <xsd:element name="CreateXMLSignatureResponse" type="CreateXMLSignatureResponseType"/>
+  <!--########## Verify CMS Signature ###-->
+  <!--### Verifiy CMS Signature Request ###-->
+  <xsd:element name="VerifyCMSSignatureRequest">
+    <xsd:complexType>
+      <xsd:complexContent>
+        <xsd:extension base="VerifyCMSSignatureRequestType">
+          <xsd:attribute name="Signatories" type="SignatoriesType" use="optional" default="1"/>
+        </xsd:extension>
+      </xsd:complexContent>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:complexType name="VerifyCMSSignatureRequestType">
+    <xsd:sequence>
+      <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
+      <xsd:element name="CMSSignature" type="xsd:base64Binary"/>
+      <xsd:element name="DataObject" type="CMSDataObjectOptionalMetaType" minOccurs="0"/>
+      <xsd:element name="TrustProfileID">
+        <xsd:annotation>
+          <xsd:documentation>mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+  <!--### Verify CMS Signature Response ###-->
+  <xsd:element name="VerifyCMSSignatureResponse" type="VerifyCMSSignatureResponseType"/>
+  <xsd:complexType name="VerifyCMSSignatureResponseType">
+    <xsd:sequence maxOccurs="unbounded">
+      <xsd:element name="SignerInfo" type="dsig:KeyInfoType">
+        <xsd:annotation>
+          <xsd:documentation>only ds:X509Data and RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any;publicAuthority is included as X509Data/any</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="SignatureCheck" type="CheckResultType"/>
+      <xsd:element name="CertificateCheck" type="CheckResultType"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <!--########## Verify XML Signature ###-->
+  <!--### Verify XML Signature Request ###-->
+  <xsd:element name="VerifyXMLSignatureRequest" type="VerifyXMLSignatureRequestType"/>
+  <xsd:complexType name="VerifyXMLSignatureRequestType">
+    <xsd:sequence>
+      <xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
+      <xsd:element name="VerifySignatureInfo">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="VerifySignatureEnvironment" type="ContentOptionalRefType"/>
+            <xsd:element name="VerifySignatureLocation" type="xsd:token"/>
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:choice minOccurs="0" maxOccurs="unbounded">
+        <xsd:element ref="SupplementProfile"/>
+        <xsd:element name="SupplementProfileID" type="xsd:string"/>
+      </xsd:choice>
+      <xsd:element name="SignatureManifestCheckParams" minOccurs="0">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="ReferenceInfo" type="VerifyTransformsDataType" maxOccurs="unbounded">
+              <xsd:annotation>
+                <xsd:documentation>Pro dsig:Reference-Element in der zu überprüfenden XML-Signatur muss hier ein ReferenceInfo-Element erscheinen. Die Reihenfolge der einzelnen ReferenceInfo Elemente entspricht jener der dsig:Reference Elemente in der XML-Signatur.</xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+          </xsd:sequence>
+          <xsd:attribute name="ReturnReferenceInputData" type="xsd:boolean" use="optional" default="true"/>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="ReturnHashInputData" minOccurs="0"/>
+      <xsd:element name="TrustProfileID">
+        <xsd:annotation>
+          <xsd:documentation>mit diesem Profil wird eine Menge von vertrauenswürdigen Wurzelzertifikaten spezifiziert</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+  <!--### Verify XML Signature Response ###-->
+  <xsd:element name="VerifyXMLSignatureResponse" type="VerifyXMLSignatureResponseType"/>
+  <xsd:complexType name="VerifyXMLSignatureResponseType">
+    <xsd:sequence>
+      <xsd:element name="SignerInfo" type="dsig:KeyInfoType">
+        <xsd:annotation>
+          <xsd:documentation>only ds:X509Data and ds:RetrievalMethod is supported; QualifiedCertificate is included as X509Data/any; PublicAuthority is included as X509Data/any</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="HashInputData" type="ContentExLocRefBaseType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="ReferenceInputData" type="ContentExLocRefBaseType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="SignatureCheck" type="ReferencesCheckResultType"/>
+      <xsd:element name="SignatureManifestCheck" type="ReferencesCheckResultType" minOccurs="0"/>
+      <xsd:element name="XMLDSIGManifestCheck" type="ManifestRefsCheckResultType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="CertificateCheck" type="CheckResultType"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:simpleType name="ProfileIdentifierType">
+    <xsd:restriction base="xsd:token"/>
+  </xsd:simpleType>
+  <xsd:complexType name="MetaInfoType">
+    <xsd:sequence>
+      <xsd:element name="MimeType" type="MimeTypeType"/>
+      <xsd:element name="Description" type="xsd:anyURI" minOccurs="0"/>
+      <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="FinalDataMetaInfoType">
+    <xsd:complexContent>
+      <xsd:extension base="MetaInfoType">
+        <xsd:sequence>
+          <xsd:element name="Type" type="xsd:anyURI" minOccurs="0"/>
+        </xsd:sequence>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="DataObjectInfoType">
+    <xsd:sequence>
+      <xsd:element name="DataObject">
+        <xsd:complexType>
+          <xsd:complexContent>
+            <xsd:extension base="ContentOptionalRefType"/>
+          </xsd:complexContent>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:choice>
+        <xsd:annotation>
+          <xsd:documentation>Auswahl: Entweder explizite Angabe EINER Transformationskette inklusive ggf. sinnvoller Supplements oder Verweis auf ein benanntes Profil</xsd:documentation>
+        </xsd:annotation>
+        <xsd:element ref="CreateTransformsInfoProfile"/>
+        <xsd:element name="CreateTransformsInfoProfileID" type="ProfileIdentifierType"/>
+      </xsd:choice>
+    </xsd:sequence>
+    <xsd:attribute name="Structure" use="required">
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="detached"/>
+          <xsd:enumeration value="enveloping"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="TransformsInfoType">
+    <xsd:sequence>
+      <xsd:element ref="dsig:Transforms" minOccurs="0"/>
+      <xsd:element name="FinalDataMetaInfo" type="FinalDataMetaInfoType"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="XMLDataObjectAssociationType">
+    <xsd:sequence>
+      <xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>
+      <xsd:element name="Content" type="ContentRequiredRefType"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="CMSDataObjectOptionalMetaType">
+    <xsd:sequence>
+      <xsd:element name="MetaInfo" type="MetaInfoType" minOccurs="0"/>
+      <xsd:element name="Content" type="CMSContentBaseType"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="CMSContentBaseType">
+    <xsd:complexContent>
+      <xsd:restriction base="ContentOptionalRefType">
+        <xsd:choice minOccurs="0">
+          <xsd:element name="Base64Content" type="xsd:base64Binary"/>
+        </xsd:choice>
+      </xsd:restriction>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="CheckResultType">
+    <xsd:sequence>
+      <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
+      <xsd:element name="Info" type="AnyChildrenType" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="ReferencesCheckResultType">
+    <xsd:complexContent>
+      <xsd:restriction base="CheckResultType">
+        <xsd:sequence>
+          <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
+          <xsd:element name="Info" type="ReferencesCheckResultInfoType" minOccurs="0"/>
+        </xsd:sequence>
+      </xsd:restriction>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="ReferencesCheckResultInfoType" mixed="true">
+    <xsd:complexContent mixed="true">
+      <xsd:restriction base="AnyChildrenType">
+        <xsd:sequence>
+          <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+          <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+      </xsd:restriction>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="ManifestRefsCheckResultType">
+    <xsd:complexContent>
+      <xsd:restriction base="CheckResultType">
+        <xsd:sequence>
+          <xsd:element name="Code" type="xsd:nonNegativeInteger"/>
+          <xsd:element name="Info" type="ManifestRefsCheckResultInfoType"/>
+        </xsd:sequence>
+      </xsd:restriction>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="ManifestRefsCheckResultInfoType" mixed="true">
+    <xsd:complexContent mixed="true">
+      <xsd:restriction base="AnyChildrenType">
+        <xsd:sequence>
+          <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+          <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/>
+          <xsd:element name="ReferringSigReference" type="xsd:positiveInteger"/>
+        </xsd:sequence>
+      </xsd:restriction>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <!--########## Error Response ###-->
+  <xsd:element name="ErrorResponse" type="ErrorResponseType">
+    <xsd:annotation>
+      <xsd:documentation>Resultat, falls die Signaturerstellung gescheitert ist</xsd:documentation>
+    </xsd:annotation>
+  </xsd:element>
+  <xsd:complexType name="ErrorResponseType">
+    <xsd:sequence>
+      <xsd:element name="ErrorCode" type="xsd:integer"/>
+      <xsd:element name="Info" type="xsd:string"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <!--########## Auxiliary Types ###-->
+  <xsd:simpleType name="KeyIdentifierType">
+    <xsd:restriction base="xsd:string"/>
+  </xsd:simpleType>
+  <xsd:simpleType name="KeyStorageType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="Software"/>
+      <xsd:enumeration value="Hardware"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="MimeTypeType">
+    <xsd:restriction base="xsd:token"/>
+  </xsd:simpleType>
+  <xsd:complexType name="AnyChildrenType" mixed="true">
+    <xsd:sequence>
+      <xsd:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="XMLContentType" mixed="true">
+    <xsd:complexContent mixed="true">
+      <xsd:extension base="AnyChildrenType">
+        <xsd:attribute ref="xml:space" use="optional"/>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="ContentBaseType">
+    <xsd:choice minOccurs="0">
+      <xsd:element name="Base64Content" type="xsd:base64Binary"/>
+      <xsd:element name="XMLContent" type="XMLContentType"/>
+      <xsd:element name="LocRefContent" type="xsd:anyURI"/>
+    </xsd:choice>
+  </xsd:complexType>
+  <xsd:complexType name="ContentExLocRefBaseType">
+    <xsd:complexContent>
+      <xsd:restriction base="ContentBaseType">
+        <xsd:choice minOccurs="0">
+          <xsd:element name="Base64Content" type="xsd:base64Binary"/>
+          <xsd:element name="XMLContent" type="XMLContentType"/>
+        </xsd:choice>
+      </xsd:restriction>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="ContentOptionalRefType">
+    <xsd:complexContent>
+      <xsd:extension base="ContentBaseType">
+        <xsd:attribute name="Reference" type="xsd:anyURI" use="optional"/>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="ContentRequiredRefType">
+    <xsd:complexContent>
+      <xsd:restriction base="ContentOptionalRefType">
+        <xsd:choice minOccurs="0">
+          <xsd:element name="Base64Content" type="xsd:base64Binary"/>
+          <xsd:element name="XMLContent" type="XMLContentType"/>
+          <xsd:element name="LocRefContent" type="xsd:anyURI"/>
+        </xsd:choice>
+        <xsd:attribute name="Reference" type="xsd:anyURI" use="required"/>
+      </xsd:restriction>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="VerifyTransformsDataType">
+    <xsd:choice maxOccurs="unbounded">
+      <xsd:annotation>
+        <xsd:documentation>Ein oder mehrere Transformationswege können von der Applikation an MOA mitgeteilt werden. Die zu prüfende Signatur hat zumindest einem dieser Transformationswege zu entsprechen. Die Angabe kann explizit oder als Profilbezeichner erfolgen.</xsd:documentation>
+      </xsd:annotation>
+      <xsd:element ref="VerifyTransformsInfoProfile"/>
+      <xsd:element name="VerifyTransformsInfoProfileID" type="xsd:string">
+        <xsd:annotation>
+          <xsd:documentation>Profilbezeichner für einen Transformationsweg</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+    </xsd:choice>
+  </xsd:complexType>
+  <xsd:element name="QualifiedCertificate"/>
+  <xsd:element name="PublicAuthority" type="PublicAuthorityType"/>
+  <xsd:complexType name="PublicAuthorityType">
+    <xsd:sequence>
+      <xsd:element name="Code" type="xsd:string" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:simpleType name="SignatoriesType">
+    <xsd:union memberTypes="AllSignatoriesType">
+      <xsd:simpleType>
+        <xsd:list itemType="xsd:positiveInteger"/>
+      </xsd:simpleType>
+    </xsd:union>
+  </xsd:simpleType>
+  <xsd:simpleType name="AllSignatoriesType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="all"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:complexType name="CreateSignatureLocationType">
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:token">
+        <xsd:attribute name="Index" type="xsd:nonNegativeInteger" use="required"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="TransformParameterType">
+    <xsd:choice minOccurs="0">
+      <xsd:annotation>
+        <xsd:documentation>Die Angabe des Transformationsparameters (explizit oder als Hashwert) kann unterlassen werden, wenn die Applikation von der Unveränderlichkeit des Inhalts der in "Transformationsparamter", Attribut "URI" angegebenen URI ausgehen kann.</xsd:documentation>
+      </xsd:annotation>
+      <xsd:element name="Base64Content" type="xsd:base64Binary">
+        <xsd:annotation>
+          <xsd:documentation>Der Transformationsparameter explizit angegeben.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="Hash">
+        <xsd:annotation>
+          <xsd:documentation>Der Hashwert des Transformationsparameters.</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element ref="dsig:DigestMethod"/>
+            <xsd:element ref="dsig:DigestValue"/>
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:choice>
+    <xsd:attribute name="URI" type="xsd:anyURI" use="required"/>
+  </xsd:complexType>
+  <xsd:element name="CreateSignatureEnvironmentProfile">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="CreateSignatureLocation" type="CreateSignatureLocationType"/>
+        <xsd:element name="Supplement" type="XMLDataObjectAssociationType" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:element name="VerifyTransformsInfoProfile">
+    <xsd:annotation>
+      <xsd:documentation>Explizite Angabe des Transformationswegs</xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element ref="dsig:Transforms" minOccurs="0"/>
+        <xsd:element name="TransformParameter" type="TransformParameterType" minOccurs="0" maxOccurs="unbounded">
+          <xsd:annotation>
+            <xsd:documentation>Alle impliziten Transformationsparameter, die zum Durchlaufen der oben angeführten Transformationskette bekannt sein müssen, müssen hier angeführt werden. Das Attribut "URI" bezeichnet den Transformationsparameter in exakt jener Weise, wie er in der zu überprüfenden Signatur gebraucht wird.</xsd:documentation>
+          </xsd:annotation>
+        </xsd:element>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:element name="Supplement" type="XMLDataObjectAssociationType"/>
+  <xsd:element name="SupplementProfile" type="XMLDataObjectAssociationType"/>
+  <xsd:element name="CreateTransformsInfoProfile">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="CreateTransformsInfo" type="TransformsInfoType"/>
+        <xsd:element ref="Supplement" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+</xsd:schema>
-- 
cgit v1.2.3


From eaeae88fff31b34a75fff38fb7f08c6c6415aa3d Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 7 Nov 2007 09:55:40 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1035
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 id/server/auth/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 2c123a8ec..a6395634c 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>1.4.2beta2</version>
+		<version>1.4.2</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-auth</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.2beta2</version>
+	<version>1.4.2</version>
 	<name>MOA ID-Auth WebService</name>
 	
 	<properties>
@@ -53,7 +53,7 @@
 	</build>
 	
 	<dependencies>
-		<!-- we need Axis 1.4 here because 1.0 is in SPSS included -->
+		<!-- we need Axis 1.4 here because 1.0 is included in SPSS -->
 		<dependency>
 			<groupId>axis</groupId>
 			<artifactId>axis</artifactId>
-- 
cgit v1.2.3


From de1331212b42603ed762ec69c234b32a71fa764d Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Fri, 16 Nov 2007 15:18:03 +0000
Subject: Refined Eclipse WTP settings; changed standard configuration

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1041 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/auth/.project                                   | 5 +++--
 id/server/auth/.settings/org.eclipse.jdt.core.prefs       | 7 ++++++-
 id/server/auth/.settings/org.eclipse.wst.common.component | 5 ++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/.project b/id/server/auth/.project
index a8a455ff2..c397a88ee 100644
--- a/id/server/auth/.project
+++ b/id/server/auth/.project
@@ -3,6 +3,7 @@
 	<name>moa-id-auth</name>
 	<comment></comment>
 	<projects>
+		<project>moa-common</project>
 		<project>moa-id-lib</project>
 		<project>moa-spss-lib</project>
 	</projects>
@@ -23,12 +24,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<name>kr.javanese.devtools.m2wtp.wtpDepBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>kr.javanese.devtools.m2wtp.wtpDepBuilder</name>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
diff --git a/id/server/auth/.settings/org.eclipse.jdt.core.prefs b/id/server/auth/.settings/org.eclipse.jdt.core.prefs
index 1b042e027..63fe7cb8a 100644
--- a/id/server/auth/.settings/org.eclipse.jdt.core.prefs
+++ b/id/server/auth/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,12 @@
-#Fri Sep 14 14:27:19 CEST 2007
+#Fri Nov 16 13:12:23 CET 2007
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
 org.eclipse.jdt.core.compiler.source=1.4
diff --git a/id/server/auth/.settings/org.eclipse.wst.common.component b/id/server/auth/.settings/org.eclipse.wst.common.component
index f256fdc92..5f3e4a378 100644
--- a/id/server/auth/.settings/org.eclipse.wst.common.component
+++ b/id/server/auth/.settings/org.eclipse.wst.common.component
@@ -10,7 +10,10 @@
 <dependency-type>uses</dependency-type>
 <wb-resource deploy-path="/WEB-INF/LIB" source-path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 </dependent-module>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
 <property name="java-output-path" value="target/classes"/>
-<property name="context-root" value="moa-id-auth"/>
+        <property name="context-root" value="moa-id-auth"/>
 </wb-module>
 </project-modules>
-- 
cgit v1.2.3


From 5a7af6f83687f1cb9d5e1c8acd8056dafb49b212 Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Thu, 6 Dec 2007 16:48:51 +0000
Subject: added mvn dependency for eclipse

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1053 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/auth/.classpath | 1 +
 1 file changed, 1 insertion(+)

(limited to 'id/server/auth')

diff --git a/id/server/auth/.classpath b/id/server/auth/.classpath
index 46c5c5ab0..8cd9e4eb8 100644
--- a/id/server/auth/.classpath
+++ b/id/server/auth/.classpath
@@ -3,5 +3,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v5.0"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
-- 
cgit v1.2.3


From 8a0a31c377fbf2873714df580e7ddf8e248e2011 Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 16 Jan 2008 13:36:18 +0000
Subject: Preparation for 1.4.3 release (changed project version)

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1058 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/auth/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index a6395634c..c015bd821 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>1.4.2</version>
+		<version>1.4.3</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-auth</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.2</version>
+	<version>1.4.3</version>
 	<name>MOA ID-Auth WebService</name>
 	
 	<properties>
-- 
cgit v1.2.3


From b1c951bd4c125f52123d4a6947f459b505f8beb1 Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Thu, 27 Mar 2008 07:36:10 +0000
Subject: Added trace logs, resolved link issues in documentation

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1062 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/auth/.classpath | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/.classpath b/id/server/auth/.classpath
index 8cd9e4eb8..d6e7fdeb6 100644
--- a/id/server/auth/.classpath
+++ b/id/server/auth/.classpath
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v5.0"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/modules"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
-- 
cgit v1.2.3


From 1b3b500b3fbf6a759dc42783f82b202674341564 Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Thu, 10 Apr 2008 08:25:10 +0000
Subject: fixed usage of axis (now 1.1)

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1068 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/auth/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index c015bd821..6060956ee 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -53,11 +53,11 @@
 	</build>
 	
 	<dependencies>
-		<!-- we need Axis 1.4 here because 1.0 is included in SPSS -->
+		<!-- we need Axis 1.1 here, 1.0 is included in SPSS -->
 		<dependency>
 			<groupId>axis</groupId>
 			<artifactId>axis</artifactId>
-			<version>1.4</version>
+			<version>1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>MOA.spss.server</groupId>
-- 
cgit v1.2.3


From 527f2ec316c6d67498ed6dfe37a95218a2ab6f54 Mon Sep 17 00:00:00 2001
From: spuchmann <spuchmann@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Mon, 15 Sep 2008 07:33:53 +0000
Subject: raised version to 1.4.4 moved licenses to root folder fixed Bug 332
 and 333 slVersion changed from 1.1 to 1.2 (MOA-ID-Configuration-1.4.4.xsd)

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1091 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/auth/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 6060956ee..d2aa59f2e 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>1.4.3</version>
+		<version>1.4.4</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-auth</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.3</version>
+	<version>1.4.4</version>
 	<name>MOA ID-Auth WebService</name>
 	
 	<properties>
-- 
cgit v1.2.3


From aebb5cd04d43b25b8d65237ba49fddf5f5dd1a8c Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Tue, 7 Jul 2009 14:27:40 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1114
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 id/server/auth/.classpath                                 |  9 ++++++++-
 id/server/auth/.project                                   |  6 ++++++
 id/server/auth/.settings/org.eclipse.wst.common.component | 15 +++++++--------
 .../org.eclipse.wst.common.project.facet.core.xml         |  2 +-
 id/server/auth/pom.xml                                    |  4 ++--
 5 files changed, 24 insertions(+), 12 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/.classpath b/id/server/auth/.classpath
index d6e7fdeb6..6acd7de03 100644
--- a/id/server/auth/.classpath
+++ b/id/server/auth/.classpath
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
 	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v5.0"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/modules"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/id/server/auth/.project b/id/server/auth/.project
index c397a88ee..90cbf1ff3 100644
--- a/id/server/auth/.project
+++ b/id/server/auth/.project
@@ -8,6 +8,11 @@
 		<project>moa-spss-lib</project>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -41,5 +46,6 @@
 		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
 		<nature>kr.javanese.devtools.m2wtp.m2wtpNature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
 </projectDescription>
diff --git a/id/server/auth/.settings/org.eclipse.wst.common.component b/id/server/auth/.settings/org.eclipse.wst.common.component
index 5f3e4a378..b116cf610 100644
--- a/id/server/auth/.settings/org.eclipse.wst.common.component
+++ b/id/server/auth/.settings/org.eclipse.wst.common.component
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-modules id="moduleCoreId" project-version="1.5.0">
 <wb-module deploy-name="moa-id-auth">
-<wb-resource deploy-path="/" source-path="/src/main/webapp"/>
 <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
-<dependency-type>uses</dependency-type>
-</dependent-module>
-<dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">
-<dependency-type>uses</dependency-type>
-<wb-resource deploy-path="/WEB-INF/LIB" source-path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-</dependent-module>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
             <dependency-type>uses</dependency-type>
         </dependent-module>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
 <property name="java-output-path" value="target/classes"/>
         <property name="context-root" value="moa-id-auth"/>
 </wb-module>
diff --git a/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml
index d0145894a..f30a1de6e 100644
--- a/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <installed facet="jst.web" version="2.4"/>
   <installed facet="jst.java" version="1.4"/>
+  <installed facet="jst.web" version="2.3"/>
 </faceted-project>
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index d2aa59f2e..6d5a5538e 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>1.4.4</version>
+		<version>1.4.5</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-auth</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.4</version>
+	<version>1.4.5</version>
 	<name>MOA ID-Auth WebService</name>
 	
 	<properties>
-- 
cgit v1.2.3


From 4c7661af6d16a8b598a11548a1df61d526b86b4d Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Thu, 9 Jul 2009 12:52:53 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1115
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 .../auth/src/main/webapp/errorpage-auth_debug.jsp  | 53 ++++++++++++++++++++++
 .../auth/src/main/webapp/errorpage-auth_empty.jsp  | 13 ++++++
 2 files changed, 66 insertions(+)
 create mode 100644 id/server/auth/src/main/webapp/errorpage-auth_debug.jsp
 create mode 100644 id/server/auth/src/main/webapp/errorpage-auth_empty.jsp

(limited to 'id/server/auth')

diff --git a/id/server/auth/src/main/webapp/errorpage-auth_debug.jsp b/id/server/auth/src/main/webapp/errorpage-auth_debug.jsp
new file mode 100644
index 000000000..8e1e331d6
--- /dev/null
+++ b/id/server/auth/src/main/webapp/errorpage-auth_debug.jsp
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<%@ page contentType="text/html; charset=UTF-8" %>
+<html>
+<head>
+<title>Ein Fehler ist aufgetreten</title>
+</head>
+<% Throwable exceptionThrown = (Throwable)request.getAttribute("ExceptionThrown");
+   String errorMessage = (String)request.getAttribute("ErrorMessage");
+   String wrongParameters = (String)request.getAttribute("WrongParameters");
+   String logLevel = (String)request.getAttribute("LogLevel");
+%>
+
+<body>
+<h1>Fehler bei der Anmeldung</h1>
+<p>Bei der Anmeldung ist ein Fehler aufgetreten.</p>
+
+<% if (logLevel != null) { %>
+<% if (errorMessage != null) { %>
+<p>
+<%= errorMessage%><br>
+</p>
+<% } %>
+<% if (exceptionThrown != null) { %>
+<p> 
+<%= exceptionThrown.getMessage()%>
+</p>
+<% } %>
+<% if (wrongParameters != null) { %>
+<p>Die Angabe der Parameter ist unvollst&auml;ndig.<br></p>
+<b> <%= wrongParameters %> </b><br>
+<p>
+   Beispiele f&uuml;r korrekte Links zur MOA-ID Authentisierung sind:
+</p>
+<p>
+<tt>&lt;a href="https://&lt;MOA-URL&gt;/StartAuthentication?Target=&lt;Gesch&auml;ftsbereich&gt;&amp;OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&quot;&gt;</tt>
+</p>
+<p>
+<tt>&lt;a href="https://&lt;MOA-URL&gt;/SelectBKU?Target=&lt;Gesch&auml;ftsbereich&gt;&amp;OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&amp;BKUSelectionTemplate=&lt;BKU-Template-URL&gt;&quot;&gt;</tt>
+</p>
+<p>
+Im Falle einer Applikation aus dem privatwirtschaftlichen Bereich (type="businessService") entf&auml;llt die Angabe des <i>Target</i> Parameters:
+</p>
+<p>
+<tt>&lt;a href="https://&lt;MOA-URL&gt;/StartAuthentication?OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&quot;&gt;</tt>
+</p>
+<p>
+<tt>&lt;a href="https://&lt;MOA-URL&gt;/SelectBKU?OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&amp;BKUSelectionTemplate=&lt;BKU-Template-URL&gt;&quot;&gt;</tt>
+</p>
+<p>Die Angabe der Parameter <tt>&quot;Template&quot;</tt> und <tt>&quot;BKUSelectionTemplate&quot;</tt> ist optional.</p>
+<% } %>
+<% } %>
+</body>
+</html>
\ No newline at end of file
diff --git a/id/server/auth/src/main/webapp/errorpage-auth_empty.jsp b/id/server/auth/src/main/webapp/errorpage-auth_empty.jsp
new file mode 100644
index 000000000..40739efea
--- /dev/null
+++ b/id/server/auth/src/main/webapp/errorpage-auth_empty.jsp
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<%@ page contentType="text/html; charset=UTF-8" %>
+<html>
+<head>
+<title>Ein Fehler ist aufgetreten</title>
+</head>
+
+<body>
+<h1>Fehler bei der Anmeldung</h1>
+<p>Bei der Anmeldung ist ein Fehler aufgetreten.</p>
+
+</body>
+</html>
\ No newline at end of file
-- 
cgit v1.2.3


From 86cbff480108f28e40b8ef2896fbf4b4c2b07bea Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Mon, 13 Jul 2009 09:25:22 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1118
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 .../auth/src/main/webapp/errorpage-auth_debug.jsp  | 53 ----------------------
 .../auth/src/main/webapp/errorpage-auth_empty.jsp  | 13 ------
 2 files changed, 66 deletions(-)
 delete mode 100644 id/server/auth/src/main/webapp/errorpage-auth_debug.jsp
 delete mode 100644 id/server/auth/src/main/webapp/errorpage-auth_empty.jsp

(limited to 'id/server/auth')

diff --git a/id/server/auth/src/main/webapp/errorpage-auth_debug.jsp b/id/server/auth/src/main/webapp/errorpage-auth_debug.jsp
deleted file mode 100644
index 8e1e331d6..000000000
--- a/id/server/auth/src/main/webapp/errorpage-auth_debug.jsp
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<%@ page contentType="text/html; charset=UTF-8" %>
-<html>
-<head>
-<title>Ein Fehler ist aufgetreten</title>
-</head>
-<% Throwable exceptionThrown = (Throwable)request.getAttribute("ExceptionThrown");
-   String errorMessage = (String)request.getAttribute("ErrorMessage");
-   String wrongParameters = (String)request.getAttribute("WrongParameters");
-   String logLevel = (String)request.getAttribute("LogLevel");
-%>
-
-<body>
-<h1>Fehler bei der Anmeldung</h1>
-<p>Bei der Anmeldung ist ein Fehler aufgetreten.</p>
-
-<% if (logLevel != null) { %>
-<% if (errorMessage != null) { %>
-<p>
-<%= errorMessage%><br>
-</p>
-<% } %>
-<% if (exceptionThrown != null) { %>
-<p> 
-<%= exceptionThrown.getMessage()%>
-</p>
-<% } %>
-<% if (wrongParameters != null) { %>
-<p>Die Angabe der Parameter ist unvollst&auml;ndig.<br></p>
-<b> <%= wrongParameters %> </b><br>
-<p>
-   Beispiele f&uuml;r korrekte Links zur MOA-ID Authentisierung sind:
-</p>
-<p>
-<tt>&lt;a href="https://&lt;MOA-URL&gt;/StartAuthentication?Target=&lt;Gesch&auml;ftsbereich&gt;&amp;OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&quot;&gt;</tt>
-</p>
-<p>
-<tt>&lt;a href="https://&lt;MOA-URL&gt;/SelectBKU?Target=&lt;Gesch&auml;ftsbereich&gt;&amp;OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&amp;BKUSelectionTemplate=&lt;BKU-Template-URL&gt;&quot;&gt;</tt>
-</p>
-<p>
-Im Falle einer Applikation aus dem privatwirtschaftlichen Bereich (type="businessService") entf&auml;llt die Angabe des <i>Target</i> Parameters:
-</p>
-<p>
-<tt>&lt;a href="https://&lt;MOA-URL&gt;/StartAuthentication?OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&quot;&gt;</tt>
-</p>
-<p>
-<tt>&lt;a href="https://&lt;MOA-URL&gt;/SelectBKU?OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&amp;BKUSelectionTemplate=&lt;BKU-Template-URL&gt;&quot;&gt;</tt>
-</p>
-<p>Die Angabe der Parameter <tt>&quot;Template&quot;</tt> und <tt>&quot;BKUSelectionTemplate&quot;</tt> ist optional.</p>
-<% } %>
-<% } %>
-</body>
-</html>
\ No newline at end of file
diff --git a/id/server/auth/src/main/webapp/errorpage-auth_empty.jsp b/id/server/auth/src/main/webapp/errorpage-auth_empty.jsp
deleted file mode 100644
index 40739efea..000000000
--- a/id/server/auth/src/main/webapp/errorpage-auth_empty.jsp
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<%@ page contentType="text/html; charset=UTF-8" %>
-<html>
-<head>
-<title>Ein Fehler ist aufgetreten</title>
-</head>
-
-<body>
-<h1>Fehler bei der Anmeldung</h1>
-<p>Bei der Anmeldung ist ein Fehler aufgetreten.</p>
-
-</body>
-</html>
\ No newline at end of file
-- 
cgit v1.2.3


From b96b2ef653f6bc62ca8a7880dde525dc44d9a8b7 Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Mon, 10 Aug 2009 09:23:17 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1123
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 id/server/auth/.settings/.jsdtscope                           | 11 +++++++++++
 .../.settings/org.eclipse.wst.jsdt.ui.superType.container     |  1 +
 .../auth/.settings/org.eclipse.wst.jsdt.ui.superType.name     |  1 +
 id/server/auth/.settings/org.maven.ide.eclipse.prefs          |  9 +++++++++
 4 files changed, 22 insertions(+)
 create mode 100644 id/server/auth/.settings/.jsdtscope
 create mode 100644 id/server/auth/.settings/org.eclipse.wst.jsdt.ui.superType.container
 create mode 100644 id/server/auth/.settings/org.eclipse.wst.jsdt.ui.superType.name
 create mode 100644 id/server/auth/.settings/org.maven.ide.eclipse.prefs

(limited to 'id/server/auth')

diff --git a/id/server/auth/.settings/.jsdtscope b/id/server/auth/.settings/.jsdtscope
new file mode 100644
index 000000000..f40dd98e2
--- /dev/null
+++ b/id/server/auth/.settings/.jsdtscope
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/id/server/auth/.settings/org.eclipse.wst.jsdt.ui.superType.container b/id/server/auth/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 000000000..3bd5d0a48
--- /dev/null
+++ b/id/server/auth/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/id/server/auth/.settings/org.eclipse.wst.jsdt.ui.superType.name b/id/server/auth/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 000000000..05bd71b6e
--- /dev/null
+++ b/id/server/auth/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/id/server/auth/.settings/org.maven.ide.eclipse.prefs b/id/server/auth/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 000000000..a45f64227
--- /dev/null
+++ b/id/server/auth/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,9 @@
+#Tue Jul 07 16:07:00 CEST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
-- 
cgit v1.2.3


From 27be7994027944015c290e41e688e8723965bd48 Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 26 Aug 2009 11:00:54 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1139
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 id/server/auth/.project | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/.project b/id/server/auth/.project
index 90cbf1ff3..46166c2f3 100644
--- a/id/server/auth/.project
+++ b/id/server/auth/.project
@@ -8,11 +8,6 @@
 		<project>moa-spss-lib</project>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
-- 
cgit v1.2.3


From afa2a5ca9f92e81b594e8f29d9588d5e8690fba8 Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Thu, 17 Sep 2009 09:45:46 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1145
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 id/server/auth/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 6d5a5538e..e24b3273b 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>1.4.5</version>
+		<version>1.4.6</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-auth</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.5</version>
+	<version>1.4.6</version>
 	<name>MOA ID-Auth WebService</name>
 	
 	<properties>
-- 
cgit v1.2.3


From 68af85701b6f797b0d662b89b95e043ee949defd Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Fri, 2 Jul 2010 07:14:41 +0000
Subject: Merged branch 1.4.7_MOASP_TSL back into trunk.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1165 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 .../.settings/org.eclipse.wst.common.component     | 36 +++++++++++-----------
 id/server/auth/pom.xml                             |  4 +--
 id/server/auth/src/main/webapp/WEB-INF/web.xml     | 22 +++++++++++++
 3 files changed, 42 insertions(+), 20 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/.settings/org.eclipse.wst.common.component b/id/server/auth/.settings/org.eclipse.wst.common.component
index b116cf610..6e8785869 100644
--- a/id/server/auth/.settings/org.eclipse.wst.common.component
+++ b/id/server/auth/.settings/org.eclipse.wst.common.component
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-<wb-module deploy-name="moa-id-auth">
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
-        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-<property name="java-output-path" value="target/classes"/>
-        <property name="context-root" value="moa-id-auth"/>
-</wb-module>
-</project-modules>
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+<wb-module deploy-name="moa-id-auth">
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+<property name="java-output-path" value="target/classes"/>
+        <property name="context-root" value="moa-id-auth"/>
+</wb-module>
+</project-modules>
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index e24b3273b..ed9e68aa7 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>1.4.6</version>
+		<version>1.4.7</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-auth</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.6</version>
+	<version>1.4.7</version>
 	<name>MOA ID-Auth WebService</name>
 	
 	<properties>
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 5c729ef19..e1261b819 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -22,6 +22,18 @@
 		<description>Verify identity link coming from security layer</description>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.VerifyIdentityLinkServlet</servlet-class>
 	</servlet>
+	<servlet>
+		<servlet-name>VerifyCertificate</servlet-name>
+		<display-name>VerifyCertificate</display-name>
+		<description>Verify the certificate coming from security layer</description>
+		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.VerifyCertificateServlet</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>GetForeignID</servlet-name>
+		<display-name>GetForeignID</display-name>
+		<description>Gets the foreign eID from security layer</description>
+		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.GetForeignIDServlet</servlet-class>
+	</servlet>
     <servlet>
         <servlet-name>ProcessInput</servlet-name>
         <display-name>ProcessInput</display-name>
@@ -76,6 +88,16 @@
 		<servlet-name>VerifyIdentityLink</servlet-name>
 		<url-pattern>/VerifyIdentityLink</url-pattern>
 	</servlet-mapping>
+		<servlet-mapping>
+		<servlet-name>VerifyCertificate</servlet-name>
+		<url-pattern>/VerifyCertificate</url-pattern>
+	</servlet-mapping>
+	
+	<servlet-mapping>
+		<servlet-name>GetForeignID</servlet-name>
+		<url-pattern>/GetForeignID</url-pattern>
+	</servlet-mapping>
+	
 	<servlet-mapping>
 		<servlet-name>ProcessInput</servlet-name>
 		<url-pattern>/ProcessInput</url-pattern>
-- 
cgit v1.2.3


From fa30b5b2a26a6df4e56a81283761c35ef81770e3 Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Tue, 13 Jul 2010 06:25:09 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1166
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 .../.settings/org.eclipse.wst.common.component     | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/.settings/org.eclipse.wst.common.component b/id/server/auth/.settings/org.eclipse.wst.common.component
index 6e8785869..b116cf610 100644
--- a/id/server/auth/.settings/org.eclipse.wst.common.component
+++ b/id/server/auth/.settings/org.eclipse.wst.common.component
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-<wb-module deploy-name="moa-id-auth">
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
-        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-<property name="java-output-path" value="target/classes"/>
-        <property name="context-root" value="moa-id-auth"/>
-</wb-module>
-</project-modules>
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+<wb-module deploy-name="moa-id-auth">
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+<property name="java-output-path" value="target/classes"/>
+        <property name="context-root" value="moa-id-auth"/>
+</wb-module>
+</project-modules>
-- 
cgit v1.2.3


From 0ee460b0e69cc73bb3458f11eaa9ba09e6a49e08 Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Tue, 13 Jul 2010 11:05:02 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1170
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 .../main/webapp/BKAuswahl-Musterseiten-Howto.pdf   | Bin 0 -> 178626 bytes
 .../auth/src/main/webapp/WCAG-Pruefprotokoll.pdf   | Bin 0 -> 721803 bytes
 id/server/auth/src/main/webapp/css/index.css       | 225 ++++++
 id/server/auth/src/main/webapp/iframeHandyBKU.html |  29 +
 .../auth/src/main/webapp/iframeOnlineBKU.html      |  31 +
 .../auth/src/main/webapp/img/ecard_aktivieren.jpg  | Bin 0 -> 18927 bytes
 id/server/auth/src/main/webapp/img/handy.gif       | Bin 0 -> 2632 bytes
 id/server/auth/src/main/webapp/img/karte.gif       | Bin 0 -> 2369 bytes
 id/server/auth/src/main/webapp/img/logo.jpg        | Bin 0 -> 18014 bytes
 .../src/main/webapp/img/mobilsig_aktivieren.jpg    | Bin 0 -> 19202 bytes
 id/server/auth/src/main/webapp/index.html          | 197 +++++
 id/server/auth/src/main/webapp/index.jsp           |  40 -
 id/server/auth/src/main/webapp/info_bk.html        |  96 +++
 id/server/auth/src/main/webapp/js/browser.js       | 165 ++++
 id/server/auth/src/main/webapp/js/deployJava.js    | 898 +++++++++++++++++++++
 .../auth/src/main/webapp/template_handyBKU.html    |  37 +
 .../auth/src/main/webapp/template_localBKU.html    |  29 +
 .../auth/src/main/webapp/template_onlineBKU.html   |  35 +
 18 files changed, 1742 insertions(+), 40 deletions(-)
 create mode 100644 id/server/auth/src/main/webapp/BKAuswahl-Musterseiten-Howto.pdf
 create mode 100644 id/server/auth/src/main/webapp/WCAG-Pruefprotokoll.pdf
 create mode 100644 id/server/auth/src/main/webapp/css/index.css
 create mode 100644 id/server/auth/src/main/webapp/iframeHandyBKU.html
 create mode 100644 id/server/auth/src/main/webapp/iframeOnlineBKU.html
 create mode 100644 id/server/auth/src/main/webapp/img/ecard_aktivieren.jpg
 create mode 100644 id/server/auth/src/main/webapp/img/handy.gif
 create mode 100644 id/server/auth/src/main/webapp/img/karte.gif
 create mode 100644 id/server/auth/src/main/webapp/img/logo.jpg
 create mode 100644 id/server/auth/src/main/webapp/img/mobilsig_aktivieren.jpg
 create mode 100644 id/server/auth/src/main/webapp/index.html
 delete mode 100644 id/server/auth/src/main/webapp/index.jsp
 create mode 100644 id/server/auth/src/main/webapp/info_bk.html
 create mode 100644 id/server/auth/src/main/webapp/js/browser.js
 create mode 100644 id/server/auth/src/main/webapp/js/deployJava.js
 create mode 100644 id/server/auth/src/main/webapp/template_handyBKU.html
 create mode 100644 id/server/auth/src/main/webapp/template_localBKU.html
 create mode 100644 id/server/auth/src/main/webapp/template_onlineBKU.html

(limited to 'id/server/auth')

diff --git a/id/server/auth/src/main/webapp/BKAuswahl-Musterseiten-Howto.pdf b/id/server/auth/src/main/webapp/BKAuswahl-Musterseiten-Howto.pdf
new file mode 100644
index 000000000..1c0662f15
Binary files /dev/null and b/id/server/auth/src/main/webapp/BKAuswahl-Musterseiten-Howto.pdf differ
diff --git a/id/server/auth/src/main/webapp/WCAG-Pruefprotokoll.pdf b/id/server/auth/src/main/webapp/WCAG-Pruefprotokoll.pdf
new file mode 100644
index 000000000..3722c5d7e
Binary files /dev/null and b/id/server/auth/src/main/webapp/WCAG-Pruefprotokoll.pdf differ
diff --git a/id/server/auth/src/main/webapp/css/index.css b/id/server/auth/src/main/webapp/css/index.css
new file mode 100644
index 000000000..8abeb7a5f
--- /dev/null
+++ b/id/server/auth/src/main/webapp/css/index.css
@@ -0,0 +1,225 @@
+@charset "utf-8";
+
+* {
+	margin:0;
+	padding:0;
+	border:0;
+}
+
+body {
+	margin:0;
+	padding:0;
+	color : #000;
+	background-color : #fff;
+	font-family : Verdana, Geneva, Arial, sans-serif;
+	font-size:76%;
+}
+
+/*  skiplink */
+
+#skiplinks {
+	position:relative;
+}
+
+p#skiplinks  a {
+  
+  position: absolute;
+  top: -999em;
+  left: -999em;
+  height: 0;
+  width: 0;
+  overflow: hidden;
+}
+
+p#skiplinks  a:focus, 
+p#skiplinks  a:hover, 
+p#skiplinks  a:active {  
+  height: auto;
+  width:auto;
+  left: 0;
+  top: 0;
+  padding: 4px;
+  position: absolute;
+  overflow: visible;
+  text-decoration: none;
+  z-index: 100;
+}
+
+/*layout */
+
+#wrapper {
+	min-width:746px;
+	max-width:1258px;	
+	padding: 0 10px;	
+}
+
+#banner {
+	width:100%;
+	min-height:100px;
+	padding-top:20px;
+	position:relative;
+}
+
+#bannerleft {
+	float:left;
+}
+
+#bannerleft h1 {
+	font-size:2em;
+	padding-top:10px;
+}
+
+#bannerright {
+	float:right;
+}
+
+#main {
+	clear:both;
+	position:relative;
+}
+
+/* left */
+
+#leftcontent {
+	float:left;
+	width:210px;		
+}
+
+h2#tabheader, h2#contentheader {
+	padding:2px;
+	font-size:1.1em;
+	color:#fff;
+	border-bottom:2px solid #fff;
+}
+
+#bkulogin {
+	overflow:hidden;	
+	width:210px;
+}
+
+#bkukarte {
+	float:left;
+	background: url(../img/karte.gif) no-repeat top center;
+	padding: 90px 10px 10px 10px;
+	text-align:center;
+	width:40%;
+}
+
+#bkuhandy {
+	float:right;
+	background: url(../img/handy.gif) no-repeat top center;
+	padding: 90px 10px 10px 10px;
+	text-align:center;
+	width:40%;
+}
+
+button {
+	background: #efefef;
+	border:1px solid #000;
+	cursor: pointer;
+}
+
+#installJava, #BrowserNOK {
+	clear:both;
+	font-size:0.8em;
+	padding:4px;
+}
+
+#localBKU {
+	padding:4px;
+}
+
+#tab {
+	margin-top:2px;
+	padding:2px;
+	clear:both;
+}
+
+#leftcontent a {
+	text-decoration:none;
+	color: #000;
+	display:block;
+	padding:4px;	
+}
+
+#leftcontent a:hover, #leftcontent a:focus, #leftcontent a:active {
+	text-decoration:underline;
+	color: #000;	
+}
+
+#navlist {
+	margin-top:20px;
+}
+
+#navlist ul {
+	list-style: none;
+	margin-left: 0;
+}
+
+#navlist li {	
+	border-bottom:1px solid #fff;
+}
+
+iframe {
+	width:210px;
+}
+
+/* right */
+
+#rightcontent {
+	float:right;
+	width:210px;
+}
+
+#centercontent {
+	width:auto;
+	margin: 0 220px;
+}
+
+/* center */
+
+#content {
+	padding:20px;
+}
+
+#content a {
+	text-decoration:underline;
+	color: #000;
+}
+
+#content a:hover, #content a:focus, #content a:active {
+	text-decoration:underline;
+	color: #000;	
+}
+
+p {
+	margin-bottom:1em;
+}
+
+.lightblock{
+  text-align : left;
+  padding : 5px 5px 5px 5px;
+}
+
+
+/* [OPTIONAL] Geben Sie hier die Farbe fuer den hellen Hintergrund an */
+.hell {
+	background-color : #FFBBCB;
+}
+
+/* [OPTIONAL] Geben Sie hier die Farbe fuer den dunklen Hintergrund an */
+.dunkel {
+	background-color: #993366;
+}
+
+/* [OPTIONAL] Geben Sie hier die Farbe fuer Links an */
+#leftcontent a, #content a {
+	color: blue;
+}
+
+@media print {
+	#wrapper { width:100%;}
+	#banner {width:640px;}
+	#rightcontent {display: none;}
+	#centercontent {width:400px; margin-right:0;}		
+}
diff --git a/id/server/auth/src/main/webapp/iframeHandyBKU.html b/id/server/auth/src/main/webapp/iframeHandyBKU.html
new file mode 100644
index 000000000..24a2d80f9
--- /dev/null
+++ b/id/server/auth/src/main/webapp/iframeHandyBKU.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="de">
+	<head>
+    	<title>iFrame Handy BKU</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    	<meta http-equiv="CACHE-CONTROL" content="NO-CACHE">
+    	<meta http-equiv="PRAGMA" content="NO-CACHE">
+    	<script type="text/javascript">
+			window.onload=function() {
+      			document.moaidform.submit();
+      			return;
+      		}
+		</script>
+	</head>
+	<body>
+		Bitte warten...
+		
+		<!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an -->
+		<!-- z.B.: action="https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at" -->
+		<FORM  name="moaidform" action="[MOA_ID_STARTAUTHENTICATION]" method="post">
+    	<!-- [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Handy BKU an -->
+			<!-- z.B.: value="https://yoururl.at/moa-id-auth/template_handyBKU.html"-->
+			<input type="hidden" name="Template" value="[URL_TO_HANDYBKU_TEMPLATE]">
+			<input type="hidden" name="bkuURI" value="https://www.a-trust.at/mobile/https-security-layer-request/default.aspx">
+		</FORM>
+		
+		<hr>
+	</body>
+</html>
\ No newline at end of file
diff --git a/id/server/auth/src/main/webapp/iframeOnlineBKU.html b/id/server/auth/src/main/webapp/iframeOnlineBKU.html
new file mode 100644
index 000000000..e92420e7a
--- /dev/null
+++ b/id/server/auth/src/main/webapp/iframeOnlineBKU.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="de">
+	<head>
+		<title>iFrame Online BKU</title>
+    	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	    <meta http-equiv="CACHE-CONTROL" content="NO-CACHE">
+    	<meta http-equiv="PRAGMA" content="NO-CACHE">
+	    <script type="text/javascript">
+			window.onload=function() {
+    		  	document.moaidform.submit();
+      			return;
+      		}
+		</script>
+	</head>
+	<body>
+		Bitte warten...
+		
+        <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an -->
+		<!-- z.B.: action="https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at" -->
+		<form method="POST" name="moaidform" id="moa" action="[MOA_ID_STARTAUTHENTICATION]">
+			<!-- [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Online BKU an -->
+			<!-- z.B.: value="https://yoururl.at/moa-id-auth/template_onlineBKU.html"-->
+			<input type="hidden" name="Template" value="[URL_TO_ONLINEBKU_TEMPLATE]">
+            <!-- [MUSS] Geben Sie hier die URL zur Online BKU an -->
+			<!-- z.B.: value="https://yoururl.at/bkuonline/https-security-layer-request"-->
+            <input type="hidden" name="bkuURI" value="[URL_TO_ONLINEBKU]">
+    	</form>
+	
+		<hr>
+	</body>
+</html>
\ No newline at end of file
diff --git a/id/server/auth/src/main/webapp/img/ecard_aktivieren.jpg b/id/server/auth/src/main/webapp/img/ecard_aktivieren.jpg
new file mode 100644
index 000000000..4b29a9786
Binary files /dev/null and b/id/server/auth/src/main/webapp/img/ecard_aktivieren.jpg differ
diff --git a/id/server/auth/src/main/webapp/img/handy.gif b/id/server/auth/src/main/webapp/img/handy.gif
new file mode 100644
index 000000000..088ec0957
Binary files /dev/null and b/id/server/auth/src/main/webapp/img/handy.gif differ
diff --git a/id/server/auth/src/main/webapp/img/karte.gif b/id/server/auth/src/main/webapp/img/karte.gif
new file mode 100644
index 000000000..1ec7afc2e
Binary files /dev/null and b/id/server/auth/src/main/webapp/img/karte.gif differ
diff --git a/id/server/auth/src/main/webapp/img/logo.jpg b/id/server/auth/src/main/webapp/img/logo.jpg
new file mode 100644
index 000000000..6bfc6a1e9
Binary files /dev/null and b/id/server/auth/src/main/webapp/img/logo.jpg differ
diff --git a/id/server/auth/src/main/webapp/img/mobilsig_aktivieren.jpg b/id/server/auth/src/main/webapp/img/mobilsig_aktivieren.jpg
new file mode 100644
index 000000000..e72aeadfc
Binary files /dev/null and b/id/server/auth/src/main/webapp/img/mobilsig_aktivieren.jpg differ
diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html
new file mode 100644
index 000000000..cbe587f2e
--- /dev/null
+++ b/id/server/auth/src/main/webapp/index.html
@@ -0,0 +1,197 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="de">
+    <head>
+        <!-- [OPTIONAL] Aendern Sie hier den Titel der Seite -->
+        <title>
+            Musterseite
+        </title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+        <meta http-equiv="Content-Style-Type" content="text/css">
+        <link rel="stylesheet" type="text/css" href="css/index.css">
+        <script src="js/browser.js" type="text/javascript"></script>
+        <script src="js/deployJava.js" type="text/javascript"></script>
+        <script type="text/javascript">
+			window.onload=function() {
+				document.getElementById("localBKU").style.display="none";
+				document.getElementById("installJava").style.display="none";
+				document.getElementById("BrowserNOK").style.display="none";
+				return;
+        	}
+
+	        function bkuOnlineClicked() {
+				<!-- [OPTIONAL] Um die lokale BKU auszublenden, ersetzen Sie in der folgenden Zeile "block" durch "none" -->
+				document.getElementById("localBKU").style.display="block"; 
+ 				document.getElementById("installJava").style.display="none";
+        		document.getElementById("BrowserNOK").style.display="none";
+
+		        var el = document.getElementById("bkulogin");
+        		var parent = el.parentNode;
+				
+		        if ( navigator.javaEnabled() && ( deployJava.versionCheck("1.6.0_11+") || (  BrowserDetect.browser.toLowerCase() == "safari" && navigator.platform.toLowerCase().indexOf('win')==0 ))) {
+		      
+				
+        			if( BrowserDetect.browser.toLowerCase() != "explorer" && BrowserDetect.browser.toLowerCase() != "firefox" && BrowserDetect.browser.toLowerCase() != "mozilla") {
+				        alert("Hinweis! \nUm die Online BKU verwenden zu koennen benoetigen Sie Java 1.6 oder hoeher.");
+			        }
+		
+			 		var iframe = document.createElement("iframe");
+			        iframe.setAttribute("src", "iframeOnlineBKU.html");
+			        iframe.setAttribute("width", "210");
+			        iframe.setAttribute("height", "150");
+			        iframe.setAttribute("frameborder", "0");
+			        iframe.setAttribute("scrolling", "no");
+			        iframe.setAttribute("title", "Login");
+
+			        parent.replaceChild(iframe, el);
+        		} 
+				else {
+
+			        okbrowser=true;
+			        if( BrowserDetect.browser.toLowerCase() == "explorer" ||BrowserDetect.browser.toLowerCase() == "firefox" || BrowserDetect.browser.toLowerCase() == "safari" || BrowserDetect.browser.toLowerCase() == "mozilla")    {
+				        okbrowser=true;
+        			} 
+        			else {
+        				okbrowser=false;
+        		}
+				
+				if(okbrowser==true) {  
+        			parent.removeChild(el);
+			        document.getElementById("installJava").style.display="block";
+        		} else {
+       				parent.removeChild(el);
+			        document.getElementById("BrowserNOK").style.display="block";
+        		}
+        	}
+        }
+
+        function bkuHandyClicked() {
+	        document.getElementById("localBKU").style.display="none";
+    	    document.getElementById("installJava").style.display="none";
+        	document.getElementById("BrowserNOK").style.display="none";
+
+	        var el = document.getElementById("bkulogin");
+    	    var parent = el.parentNode;
+         
+        	var iframe = document.createElement("iframe");
+	        iframe.setAttribute("src", "iframeHandyBKU.html");
+    	    iframe.setAttribute("width", "210");
+        	iframe.setAttribute("height", "149");
+	        iframe.setAttribute("frameborder", "0");
+        	iframe.setAttribute("scrolling", "no");
+    	    iframe.setAttribute("title", "Login");
+
+	        parent.replaceChild(iframe, el);
+        }
+        </script>
+    </head>
+    <body>
+        <div id="wrapper">
+            <p id="skiplinks">
+                <a href="#content">Zum Inhalt springen</a>            
+			</p>
+			<div id="banner">
+                <!-- [OPTIONAL] Aendern Sie hier die Titelueberschrift der Seite) -->
+                <div id="bannerleft">
+                    <h1>Musterseite</h1>
+                    <!-- Meldung im Browser, wenn JavaScript nicht aktiviert -->
+                    <noscript>
+                        <p>
+                            Bitte aktivieren Sie JavaScript.                        
+						</p>
+	                </noscript>
+                </div>                
+                <!-- [OPTIONAL] Aendern Sie hier das Logo der Seite (und Alternativtext fuer das Bild) -->
+                <div id="bannerright">
+                    <img src="img/logo.jpg" alt="Logo">                
+                 </div>
+            </div>
+			<div id="main">
+                <div id="leftcontent">
+                    <h2 id="tabheader" class="dunkel">
+                        Login mit B&uuml;rgerkarte                    
+                    </h2>
+                    <div id="bkulogin" class="hell">
+						<!-- [OPTIONAL] Um die Online BKU auszublenden, kommentieren sie das folgende div (bkukarte) aus -->
+                        <div id="bkukarte" class="hell">     
+                            <button name="bkuButton" type="button" onClick="bkuOnlineClicked();">KARTE</button>
+                        </div>
+						<!-- [OPTIONAL] Um die Mobile BKU auszublenden, kommentieren sie das folgende div (bkukhandy) aus -->
+                        <div id="bkuhandy" class="hell">
+                            <button name="bkuButton" type="button" onClick="bkuHandyClicked();">HANDY</button>
+                        </div> 
+                    </div>
+
+                    <div id="installJava" style="display:none" class="hell">
+                        Um die Online BKU verwenden zu koennen benoetigen Sie die aktuellste Version von Java 1.6 oder hoeher. Unter <a href="http://java.sun.com/webapps/getjava/BrowserRedirect?host=java.com" target="_blank">http://java.sun.com/</a> koennen sie Java herunterladen. Sie bekommen diese Meldung auch, wenn Java in den Browser Einstellungen deaktiviert wurde.                    </div>
+
+                    <div id="BrowserNOK" style="display:none" class="hell">
+                        Der von Ihnen verwendete Browser wird derzeit nicht unterstuetzt. Fuer nicht kompatible Browser verwenden Sie bitte den Button Lokale BKU. Um die Online BKU verwenden zu koennen verwenden Sie bitte Internet Explorer, Firefox, Safari oder Google Chrome in der aktuellsten Version.                    </div>
+
+                    <div id="localBKU" style="display:none" class="hell">
+                        <hr>
+                        <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an -->
+                        <!-- z.B.: action="https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at"-->
+                        <form method="post" action="[MOA_ID_STARTAUTHENTICATION]">
+                            <input type="hidden" name="show" value="false"> 
+							<!-- [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die lokale BKU an -->
+                            <!-- z.B.: value="https://yoururl.at/moa-id-auth/template_localBKU.html"-->
+                            <input type="hidden" name="Template" value="[URL_TO_LOKALBKU_TEMPLATE]">
+                            <input type="hidden" name="bkuURI" value="https://localhost:3496/https-security-layer-request"> 
+                            <input type="submit" size="400" value="Lokale BKU">
+                        </form>
+                        <p>
+                            <small>Alternativ k&ouml;nnen Sie eine lokal installierte BKU verwenden.</small>                        
+                        </p>
+                    </div>
+                    
+                    <div id="tab" class="hell">
+                        <a href="info_bk.html" class="link_nav">Informationen zur B&uuml;rgerkarte</a>                    
+                    </div>
+                    
+                    <div id="navlist" class="hell">
+                        <ul>
+                            <li>
+                                <a href="http://www.buergerkarte.at" target="_blank">B&uuml;rgerkarte.at</a>                            </li>
+                            <li>
+                                <a href="http://www.digitales.oesterreich.gv.at/" target="_blank">Digitales &Ouml;sterreich</a>                            </li>
+                            <li>
+                                <a href="http://www.a-sit.at/" target="_blank">A-SIT</a>                            
+                            </li>
+                            <li>
+                                <a href="http://www.a-trust.at/" target="_blank">A-Trust</a>                            
+                            </li>
+                            <li>
+                                <a href="http://www.egiz.gv.at/" target="_blank">EGIZ</a>                            
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+
+                <div id="rightcontent">
+                    <p>
+                        <a href="http://www.buergerkarte.at/de/aktivieren/online.html" target="_blank"><img src="img/ecard_aktivieren.jpg" border="0" alt="eCard online aktivieren" width="210"></a>                    
+                    </p>
+                    <p>
+                        <a href="http://www.buergerkarte.at/de/aktivieren/mobil.html" target="_blank"><img src="img/mobilsig_aktivieren.jpg" border="0" alt="Mobile Signatur aktivieren" width="210"></a>                    
+                    </p>                   
+                </div>
+
+                <div id="centercontent">
+
+                    <h2 id="contentheader" class="dunkel">
+                        Hinweise zur der Musterseite                   
+                    </h2>
+
+                    <div id="content" class="hell">
+                        <p>
+                        	Eine Anleitung zur Nutzung der Musterseite finden Sie hier: <a href="BKAuswahl-Musterseiten-Howto.pdf" target="_blank">BKAuswahl-Musterseiten-Howto (PDF, 170kB)</a>.
+                        So m&uuml;ssen vor einem Login noch die Parameter für den MOA-ID Aufruf angegeben werden.</p>                        	
+                        <p>
+                        	Diese Musterseite erf&uuml;llt die Richtlinie f&uuml;r barrierefreie Webinhalte 2.0 (WCAG 2.0 des W3C) Stufe AA. Das Pr&uuml;fprotokoll hierzu finden Sie hier: <a href="WCAG-Pruefprotokoll.pdf" target="_blank">Pruefprotokoll.pdf (PDF, 705kB)</a>.
+                        </p>
+   	            	</div>
+                </div>
+            </div>
+    	</div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/id/server/auth/src/main/webapp/index.jsp b/id/server/auth/src/main/webapp/index.jsp
deleted file mode 100644
index 733ba317f..000000000
--- a/id/server/auth/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,40 +0,0 @@
-<html>
-<head>
-<title>MOA ID Auth Sample Login</title>
-</head>
-<body>
-<% 
-  String urlPath = 
-	request.getScheme() + "://" 
-	+ request.getServerName() + ":" + request.getServerPort() 
-	+ request.getContextPath() + "/";
-  String params =
-	"Target=gb&" + 
-	"OA=https://localhost:8443/moa-id-proxy/index.jsp";
-  String urlStartAuth =
-  	urlPath +
-	"StartAuthentication?" + 
-	params;
-  String templateParam =
-    "&Template=http://localhost:18080/oa/AuthTemplate.jsp";
-  String urlStartAuthCustom =
-    urlStartAuth +
-    templateParam;
-  String urlSelectBKU = 
-  	urlPath +
-  	"SelectBKU?" +
-  	params;
-  String urlSelectBKUCustom = 
-  	urlSelectBKU +
-  	templateParam +
-  	"&BKUSelectionTemplate=http://localhost:18080/oa/BKUSelectionTemplate.jsp";
-%>
-<a href="<%=urlStartAuth%>">Log in to sample application</a>
-<br>
-<a href="<%=urlStartAuthCustom%>">Log in to sample application using custom form</a>
-<br>
-<a href="<%=urlSelectBKU%>">Choose BKU (HTMLComplete or HTMLSelect) and log in</a>
-<br>
-<a href="<%=urlSelectBKUCustom%>">Choose BKU (HTMLSelect) using custom form and log in</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/id/server/auth/src/main/webapp/info_bk.html b/id/server/auth/src/main/webapp/info_bk.html
new file mode 100644
index 000000000..8bfee57f2
--- /dev/null
+++ b/id/server/auth/src/main/webapp/info_bk.html
@@ -0,0 +1,96 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="de">
+	<head>
+		<title>Information</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+        <meta http-equiv="Content-Style-Type" content="text/css">
+        <link rel="stylesheet" type="text/css" href="css/index.css">
+	</head>
+	<body>
+		<div id="wrapper">
+            <p id="skiplinks">
+                <a href="#content">Zum Inhalt springen</a>
+            </p>
+            <div id="banner">
+                <!-- [OPTIONAL] Aendern Sie hier die Titelueberschrift der Seite) -->
+                <div id="bannerleft">
+                    <h1>Musterseite</h1>
+                    <!-- Meldung im Browser, wenn JavaScript nicht aktiviert -->
+                    <noscript>
+                        <p>
+                            Bitte aktivieren Sie JavaScript.
+                        </p>
+	                </noscript>
+                </div>                
+                <!-- [OPTIONAL] Aendern Sie hier das Logo der Seite (und Alternativtext fuer das Bild) -->
+                <div id="bannerright">
+                    <img src="img/logo.jpg" alt="Logo">
+                </div>
+            </div>
+            <div id="main">
+                <div id="centercontent">
+                    <h2 id="contentheader" class="dunkel">
+                        Informationen zur B&uuml;rgerkarte
+                    </h2>
+                    <div id="content" class="hell">
+                        <p>
+                        	<B>Hinweis:</B>
+                            F&uuml;r nat&uuml;rliche Personen ist beim Login mit B&uuml;rgerkarte keine Erstanmeldung erforderlich.
+                        </p>
+                        <p>
+                        	Um mit der B&uuml;rgerkarte einsteigen zu k&ouml;nnen, ben&ouml;tigen Sie:
+                        </p>
+                        <ul>
+							<li>
+                               	eine Chipkarte, die f&uuml;r die Verwendung als B&uuml;rgerkarte geeignet ist, wie zum Beispiel Ihre e-card, Bankomatkarte oder Signaturkarte von a-trust oder ein Mobiltelefon, das zur Nutzung als Handy BKU (B&uuml;rgerkartenumgebung) registriert ist.
+							</li>
+							<li>
+                               	einen Kartenleser mit den dazugeh&ouml;rigen Treibern
+							</li>
+							<li>
+                               	eine B&uuml;rgerkartensoftware (BKU)
+                            </li>
+                        </ul>
+                 		<p>                        	
+                            Als B&uuml;rgerkartensoftware stehen folgende drei Varianten zur Verf&uuml;gung:
+                        </p>
+                        <ul>
+                        	<li><i>Lokale BKU</i>: Diese Software wird lokal auf Ihrem Computer installiert. Die Software finden sie unter <a href="http://www.buergerkarte.at/de/voraussetzungen/software.html" target="_blank">http://www.buergerkarte.at/de/voraussetzungen/software.html</a>
+                            </li>
+                            <li><i>Online-BKU</i>: Mit der Online-BKU wird keine lokale B&uuml;rgerkartensoftware am PC ben&ouml;tigt. &Uuml;ber JAVA Technologien werden die ben&ouml;tigten Funktionen als Applet im Browser ausgef&uuml;hrt. Einzige Voraussetzung ist eine aktuelle JAVA Version (ab Java 6).
+                            </li>
+                            <li><i>Mobile BKU</i>: Mit der mobilen BKU k&ouml;nnen sie mittels ihres Mobiltelefons. Voraussetzung ist eine vorherige Registrierung. Mehr Informationen hierzu finden Sie auf <a href="http://www.a-trust.at/mobile/" target="_blank">http://www.a-trust.at/mobile/</a><br>
+                          <b>Hinweis:</b><br>
+                    Wenn das JAVA-Applet nicht funktioniert (bei einer &auml;lteren JAVA Version als Java 6 oder bei einem nicht unterst&uuml;tzten Browser), m&uuml;ssen Sie die lokale BKU installieren und dann &uuml;ber die Button &quot;Login mit B&uuml;rgerkarte&quot; und &quot;Lokale BKU&quot; einsteigen.
+                        	</li>
+                        </ul>
+                        <p>
+                    	    <br>
+                        	<b>Informationen zur B&uuml;rgerkarte finden Sie hier:</b>
+                        </p>
+                        <ul>
+                           	<li>
+                               	<a href="http://www.digitales.oesterreich.gv.at" target="_blank">Digitales &Ouml;sterreich</a>: Informationen rund um E-Government
+                            </li>
+							<li>
+           						<a href="http://www.buergerkarte.at" target="_blank">B&uuml;rgerkarte</a>: Einfach verst&auml;ndliche Informationen zur B&uuml;rgerkarte                     	
+                            </li>
+                        </ul>
+						<p>
+                        	<br>
+					    	<b>Hier bekommen Sie Ihre B&uuml;rgerkarte:</b>                    
+                        </p>
+						<ul>
+                           	<li>
+                               	<a href="http://www.a-trust.at/" target="_blank">A-Trust</a>: Aktivieren der Bankomatkarte/e-card als B&uuml;rgerkarte oder Registrierung ihres Mobiltelefons als B&uuml;rgerkarte oder Ausstellung einer eigenen B&uuml;rgerkarte
+                            </li>
+                        </ul>
+						<p align="center">
+							<a href="javascript:history.back();" class="link_nav">zur&uuml;ck</a>
+						</p>                 
+					</div>
+                </div>
+            </div>
+		</div>
+	</body>
+</html>
\ No newline at end of file
diff --git a/id/server/auth/src/main/webapp/js/browser.js b/id/server/auth/src/main/webapp/js/browser.js
new file mode 100644
index 000000000..6fbf74f0a
--- /dev/null
+++ b/id/server/auth/src/main/webapp/js/browser.js
@@ -0,0 +1,165 @@
+var BrowserDetect = {
+	init: function () {
+		this.browser = this.searchString(this.dataBrowser) || "An unknown browser";
+		this.version = this.searchVersion(navigator.userAgent)
+			|| this.searchVersion(navigator.appVersion)
+			|| "an unknown version";
+		this.OS = this.searchString(this.dataOS) || "an unknown OS";
+	},
+	searchString: function (data) {
+		for (var i=0;i<data.length;i++)	{
+			var dataString = data[i].string;
+			var dataProp = data[i].prop;
+			this.versionSearchString = data[i].versionSearch || data[i].identity;
+			if (dataString) {
+				if (dataString.indexOf(data[i].subString) != -1)
+					return data[i].identity;
+			}
+			else if (dataProp)
+				return data[i].identity;
+		}
+	},
+	searchVersion: function (dataString) {
+		var index = dataString.indexOf(this.versionSearchString);
+		if (index == -1) return;
+		return parseFloat(dataString.substring(index+this.versionSearchString.length+1));
+	},
+	dataBrowser: [
+		{ 	string: navigator.userAgent,
+			subString: "OmniWeb",
+			versionSearch: "OmniWeb/",
+			identity: "OmniWeb"
+		},
+		{
+			string: navigator.vendor,
+			subString: "Apple",
+			identity: "Safari"
+		},
+		{
+			prop: window.opera,
+			identity: "Opera"
+		},
+		{
+			string: navigator.vendor,
+			subString: "iCab",
+			identity: "iCab"
+		},
+		{
+			string: navigator.vendor,
+			subString: "KDE",
+			identity: "Konqueror"
+		},
+		{
+			string: navigator.userAgent,
+			subString: "Firefox",
+			identity: "Firefox"
+		},
+		{
+			string: navigator.vendor,
+			subString: "Camino",
+			identity: "Camino"
+		},
+		{		// for newer Netscapes (6+)
+			string: navigator.userAgent,
+			subString: "Netscape",
+			identity: "Netscape"
+		},
+		{
+			string: navigator.userAgent,
+			subString: "MSIE",
+			identity: "Explorer",
+			versionSearch: "MSIE"
+		},
+		{
+			string: navigator.userAgent,
+			subString: "Gecko",
+			identity: "Mozilla",
+			versionSearch: "rv"
+		},
+		{ 		// for older Netscapes (4-)
+			string: navigator.userAgent,
+			subString: "Mozilla",
+			identity: "Netscape",
+			versionSearch: "Mozilla"
+		}
+	],
+	dataOS : [
+		{
+			string: navigator.platform,
+			subString: "Win",
+			identity: "Windows"
+		},
+		{
+			string: navigator.platform,
+			subString: "Mac",
+			identity: "Mac"
+		},
+		{
+			string: navigator.platform,
+			subString: "Linux",
+			identity: "Linux"
+		}
+	]
+
+};
+BrowserDetect.init();
+function writeBrowser() {
+
+nok=false;
+			if(BrowserDetect.browser.toLowerCase() == "explorer") {
+			if(eval(BrowserDetect.version) < 6) {
+				nok=true;
+			} 
+		}
+		if(BrowserDetect.browser.toLowerCase() == "opera") {
+			if(eval(BrowserDetect.version) < 9) {
+				nok=true;
+			}
+		}	
+		if(BrowserDetect.browser.toLowerCase() == "firefox") {
+			if(eval(BrowserDetect.version) < 1.5) {
+				nok=true;
+			} 
+		}	
+
+ if (nok==true) {
+ 
+		document.write("<TABLE BORDER=0 CELLPADDING=0 WIDTH='100%'><TR><TD VALIGN=TOP WIDTH='85%' BGCOLOR='#003399'><TABLE id='erlaeut' BORDER=1"); 
+		document.write("CELLSPACING=5 CELLPADDING=2 WIDTH='100%' ><TR><TD WIDTH='100%' BGCOLOR='#FFFFFF'><FONT COLOR='#000000'>");
+		document.write("Sehr geehrter FinanzOnline-Teilnehmer!<p>Die Men&uuml;f&uuml;hrung in FinanzOnline wurde aus technischen Gr&uuml;nden ge&auml;ndert. Da Sie m&ouml;glicherweise eine veraltete und nicht mehr dem letzten Sicherheitsstandard entsprechende Version Ihres Webbrowsers verwenden, besteht ab diesem Zeitpunkt die M&ouml;glichkeit, dass das Men&uuml; in FinanzOnline nicht richtig angezeigt werden kann.</p><p>Wir empfehlen daher bereits heute auch zu Ihrer Sicherheit, ein Update auf die aktuell g&uuml;ltige Browserversion durchzuf&uuml;hren. Die unterst&uuml;tzten Webbrowser finden Sie auf der <a href='https://www.bmf.gv.at/EGovernment/FINANZOnline/Browsereinstellungen/_start.htm' target='_blank'>BMF-Homepage unter 'E-Government'/'FinanzOnline'/'Browsereinstellungen'</a>.</p>");
+		
+		
+/*		document.write("Verwendeter Browser: " + BrowserDetect.browser + " " + BrowserDetect.version + " / " + BrowserDetect.OS);
+		if(BrowserDetect.browser.toLowerCase() == "explorer") {
+			if(eval(BrowserDetect.version) < 6) {
+				document.write("<font color='red'> *** nicht supported ***</font>");
+			} else {
+				//document.write("<font color='green'> *** supported ***</font>");
+			}
+		}
+		if(BrowserDetect.browser.toLowerCase() == "opera") {
+			if(eval(BrowserDetect.version) < 9) {
+				document.write("<font color='red'> *** nicht supported ***</font>");
+			} else {
+				//document.write("<font color='green'> *** supported ***</font>");
+			}
+		}	
+		if(BrowserDetect.browser.toLowerCase() == "firefox") {
+			if(eval(BrowserDetect.version) < 1.5) {
+				document.write("<font color='red'> *** nicht supported ***</font>");
+			} else {
+				//document.write("<font color='green'> *** supported ***</font>");
+			}
+		}	
+//		document.write("<br><br>Vorschlag für unterstütze Browser:<br>");
+//		document.write("<ul><li>Internet Explorer 6, PC</li>");
+//		document.write("<li>Internet Explorer 7, PC</li>");
+//		document.write("<li>Firefox (>= 1.5), PC + Mac + Linux</li>");
+//		document.write("<li>Safari (>= 1.3+), Mac (<- WIE TESTEN??)</li>");
+//		document.write("<li>Opera (>= 9), PC + Mac + Linux</li>");
+//		document.write("</ul>");
+*/
+		document.write("</FONT></TD></TR></TABLE></TD></TR><TR><TD WIDTH='85%'>&nbsp;</TD></TR></TABLE>");
+		
+ }		
+}
\ No newline at end of file
diff --git a/id/server/auth/src/main/webapp/js/deployJava.js b/id/server/auth/src/main/webapp/js/deployJava.js
new file mode 100644
index 000000000..0d4340c71
--- /dev/null
+++ b/id/server/auth/src/main/webapp/js/deployJava.js
@@ -0,0 +1,898 @@
+/*
+ *  Copyright (c)  2008 Sun Microsystems, Inc.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   - Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   - Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ *   - Neither the name of Sun Microsystems nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * deployJava.js
+ *
+ * This file is part of the Deployment Toolkit.  It provides functions for web
+ * pages to detect the presence of a JRE, install the latest JRE, and easily run
+ * applets or Web Start programs.  Usage guide may be found at http://<TBD>/.
+ * 
+ * The "live" copy of this file may be found at 
+ * http://java.com/js/deployJava.js.  
+ * You are encouraged to link directly to the live copy of the file.
+ *
+ * @version @(#)deployJava.js	1.13 08/10/28
+ */
+
+var deployJava = {
+    debug: null,
+
+    myInterval: null,
+    preInstallJREList: null,
+    returnPage: null,
+    brand: null,
+    locale: null,
+    installType: null,
+    
+    EAInstallEnabled: false,
+    EarlyAccessURL: null,
+    
+    // GetJava page
+    getJavaURL: 'http://java.sun.com/webapps/getjava/BrowserRedirect?host=java.com',
+    
+    // Apple redirect page
+    appleRedirectPage: 'http://www.apple.com/support/downloads/',
+
+    // mime-type of the DeployToolkit plugin object
+    mimeType: 'application/npruntime-scriptable-plugin;DeploymentToolkit',
+
+    // location of the Java Web Start launch button graphic
+    launchButtonPNG: 'http://java.sun.com/products/jfc/tsc/articles/swing2d/webstart.png',
+
+
+    /**
+     * Returns an array of currently-installed JRE version strings.  
+     * Version strings are of the form #.#[.#[_#]], with the function returning
+     * as much version information as it can determine, from just family 
+     * versions ("1.4.2", "1.5") through the full version ("1.5.0_06").
+     *
+     * Detection is done on a best-effort basis.  Under some circumstances 
+     * only the highest installed JRE version will be detected, and 
+     * JREs older than 1.4.2 will not always be detected.
+     */
+    getJREs: function() {
+        var list = new Array();
+        if (deployJava.isPluginInstalled()) {
+         var plugin =  deployJava.getPlugin();
+/*  			for (var i = 0; i < plugin.jvms.getLength(); i++) {
+                list[i] = plugin.jvms.get(i).version;
+            }
+ */		/*bug fix firefox */
+            var jvms = plugin.jvms;
+            for (var i = 0; i < jvms.getLength(); i++) {
+            list[i] = jvms.get(i).version;
+            } 
+        } else {
+            var browser = deployJava.getBrowser();
+        
+            if (browser == 'MSIE') {
+                if (deployJava.testUsingActiveX('1.8.0')) {
+                    list[0] = '1.8.0';
+                } else if (deployJava.testUsingActiveX('1.7.0')) {
+                    list[0] = '1.7.0';
+                } else if (deployJava.testUsingActiveX('1.6.0')) {
+                    list[0] = '1.6.0';
+                } else if (deployJava.testUsingActiveX('1.5.0')) {
+                    list[0] = '1.5.0';
+                } else if (deployJava.testUsingActiveX('1.4.2')) {
+                    list[0] = '1.4.2';
+                } else if (deployJava.testForMSVM()) {
+                    list[0] = '1.1';
+                }
+            }
+            else if (browser == 'Netscape Family') {
+                if (deployJava.testUsingMimeTypes('1.8')) {
+                    list[0] = '1.8.0';
+                } else if (deployJava.testUsingMimeTypes('1.7')) {
+                    list[0] = '1.7.0';
+                } else if (deployJava.testUsingMimeTypes('1.6')) {
+                    list[0] = '1.6.0';
+                } else if (deployJava.testUsingMimeTypes('1.5')) {
+                    list[0] = '1.5.0';
+                } else if (deployJava.testUsingMimeTypes('1.4.2')) {
+                    list[0] = '1.4.2';
+                }
+            } else if (browser == 'Safari') {
+                if (deployJava.testUsingPluginsArray('1.8.0')) {
+                    list[0] = '1.8.0';
+                } else if (deployJava.testUsingPluginsArray('1.7.0')) {
+                    list[0] = '1.7.0';
+                } else if (deployJava.testUsingPluginsArray('1.6.0')) {
+                    list[0] = '1.6.0';
+                } else if (deployJava.testUsingPluginsArray('1.5.0')) {
+                    list[0] = '1.5.0';
+                } else if (deployJava.testUsingPluginsArray('1.4.2')) {
+                    list[0] = '1.4.2';
+                }
+            }
+        }
+            
+        if (deployJava.debug) {
+            for (var i = 0; i < list.length; ++i) {
+                alert('We claim to have detected Java SE ' + list[i]);
+            }
+        }
+    
+        return list;
+    },
+    
+    /**
+     * Triggers a JRE installation.  The exact effect of triggering an 
+     * installation varies based on platform, browser, and if the 
+     * Deployment Toolkit plugin is installed.
+     *
+     * The requestVersion string is of the form #[.#[.#[_#]]][+|*], 
+     * which includes strings such as "1.4", "1.5.0*", and "1.6.0_02+".  
+     * A star (*) means "any version starting within this family" and 
+     * a plus (+) means "any version greater or equal to this".  
+     * "1.5.0*" * matches 1.5.0_06 but not 1.6.0_01, whereas 
+     * "1.5.0+" matches both.
+     *
+     * If the Deployment Toolkit plugin is not present, this will just call 
+     * deployJava.installLatestJRE(). 
+     */
+    installJRE: function(requestVersion) {
+        var ret = false;
+        if (deployJava.isPluginInstalled()) {
+            if (deployJava.getPlugin().installJRE(requestVersion)) {
+                deployJava.refresh();
+                if (deployJava.returnPage != null) {
+                    document.location = deployJava.returnPage;
+                }
+                return true;
+            } else {
+                return false;
+            }
+        } else {
+            return deployJava.installLatestJRE();
+        }
+    },
+
+
+    /**
+     * Triggers a JRE installation.  The exact effect of triggering an 
+     * installation varies based on platform, browser, and if the 
+     * Deployment Toolkit plugin is installed.
+     *
+     * In the simplest case, the browser window will be redirected to the 
+     * java.com JRE installation page, and (if possible) a redirect back to 
+     * the current URL upon successful installation.  The return redirect is 
+     * not always possible, as the JRE installation may require the browser to 
+     * be restarted.
+     *
+     * In the best case (when the Deployment Toolkit plugin is present), this
+     * function will immediately cause a progress dialog to be displayed 
+     * as the JRE is downloaded and installed.
+     */
+    installLatestJRE: function() {
+        if (deployJava.isPluginInstalled()) {
+            if (deployJava.getPlugin().installLatestJRE()) {
+                deployJava.refresh();
+                if (deployJava.returnPage != null) {
+                    document.location = deployJava.returnPage;
+                }
+                return true;
+            } else {
+                return false;
+            }
+        } else {
+            var browser = deployJava.getBrowser();
+            var platform = navigator.platform.toLowerCase();
+            if ((deployJava.EAInstallEnabled == 'true') && 
+                (platform.indexOf('win') != -1) && 
+                (deployJava.EarlyAccessURL != null)) {
+
+                deployJava.preInstallJREList = deployJava.getJREs();
+                if (deployJava.returnPage != null) {
+                    deployJava.myInterval = 
+                        setInterval("deployJava.poll()", 3000);
+                }
+
+                location.href = deployJava.EarlyAccessURL;
+
+                // we have to return false although there may be an install
+                // in progress now, when complete it may go to return page
+                return false;
+            } else {
+                if (browser == 'MSIE') {
+                    return deployJava.IEInstall();
+                } else if ((browser == 'Netscape Family') && 
+                           (platform.indexOf('win32') != -1)) {
+                    return deployJava.FFInstall();
+                } else {
+                    location.href = deployJava.getJavaURL + 
+                        ((deployJava.returnPage != null) ?
+                        ('&returnPage=' + deployJava.returnPage) : '') + 
+                        ((deployJava.locale != null) ?
+                        ('&locale=' + deployJava.locale) : '') +
+                        ((deployJava.brand != null) ? 
+                         ('&brand=' + deployJava.brand) : '');
+                }
+                // we have to return false although there may be an install
+                // in progress now, when complete it may go to return page
+                return false;
+            }
+        }
+    },
+
+
+    /**
+     * Ensures that an appropriate JRE is installed and then runs an applet.
+     * minimumVersion is of the form #[.#[.#[_#]]], and is the minimum 
+     * JRE version necessary to run this applet.  minimumVersion is optional, 
+     * defaulting to the value "1.1" (which matches any JRE).  
+     * If an equal or greater JRE is detected, runApplet() will call 
+     * writeAppletTag(attributes, parameters) to output the applet tag, 
+     * otherwise it will call installJRE(minimumVersion + '+').
+     *
+     * After installJRE() is called, the script will attempt to detect that the 
+     * JRE installation has completed and begin running the applet, but there
+     * are circumstances (such as when the JRE installation requires a browser
+     * restart) when this cannot be fulfilled.
+     *
+     * As with writeAppletTag(), this function should only be called prior to 
+     * the web page being completely rendered.  Note that version wildcards 
+     * (star (*) and plus (+)) are not supported, and including them in the 
+     * minimumVersion will result in an error message.
+     */
+    runApplet: function(attributes, parameters, minimumVersion) {
+        if (minimumVersion == 'undefined' || minimumVersion == null) {
+            minimumVersion = '1.1';
+        }
+
+        var regex = "^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+)(?:_(\\d+))?)?)?$";
+
+        var matchData = minimumVersion.match(regex);
+
+        if (deployJava.returnPage == null) {
+            // if there is an install, come back here and run the applet
+            deployJava.returnPage = document.location;
+        }
+
+        if (matchData != null) {
+            var browser = deployJava.getBrowser();
+            if ((browser != '?') && (browser != 'Safari')) {
+                if (deployJava.versionCheck(minimumVersion + '+')) {
+                    deployJava.writeAppletTag(attributes, parameters);
+                } else if (deployJava.installJRE(minimumVersion + '+')) {
+                    // after successfull install we need to refresh page to pick
+                    // pick up new plugin
+                    deployJava.refresh();
+                    location.href = document.location;
+                    deployJava.writeAppletTag(attributes, parameters);
+                }
+            } else {
+                // for unknown or Safari - just try to show applet
+                deployJava.writeAppletTag(attributes, parameters);
+            }
+        } else {
+            if (deployJava.debug) {
+                alert('Invalid minimumVersion argument to runApplet():' + 
+                      minimumVersion);
+            }
+        }
+    },
+
+    
+    /**
+     * Outputs an applet tag with the specified attributes and parameters, where
+     * both attributes and parameters are associative arrays.  Each key/value 
+     * pair in attributes becomes an attribute of the applet tag itself, while
+     * key/value pairs in parameters become <PARAM> tags.  No version checking 
+     * or other special behaviors are performed; the tag is simply written to 
+     * the page using document.writeln().
+     *
+     * As document.writeln() is generally only safe to use while the page is 
+     * being rendered, you should never call this function after the page 
+     * has been completed.
+     */
+    writeAppletTag: function(attributes, parameters) {
+        var s = '<' + 'applet ';
+        for (var attribute in attributes) {
+            s += (' ' + attribute + '="' + attributes[attribute] + '"');
+        }
+        s += '>';
+        document.write(s);
+    
+        if (parameters != 'undefined' && parameters != null) {
+            var codebaseParam = false;
+            for (var parameter in parameters) {
+                if (parameter == 'codebase_lookup') {
+                    codebaseParam = true;
+                }
+                s = '<param name="' + parameter + '" value="' + 
+                    parameters[parameter] + '">';
+                document.write(s);
+            }
+            if (!codebaseParam) {
+              document.write('<param name="codebase_lookup" value="false">');
+            }
+        }
+        document.write('<' + '/' + 'applet' + '>');
+    },
+    
+    
+     /**
+      * Returns true if there is a matching JRE version currently installed 
+      * (among those detected by getJREs()).  The versionPattern string is 
+      * of the form #[.#[.#[_#]]][+|*], which includes strings such as "1.4", 
+      * "1.5.0*", and "1.6.0_02+".  
+      * A star (*) means "any version within this family" and a plus (+) means 
+      * "any version greater or equal to the specified version".  "1.5.0*"
+      * matches 1.5.0_06 but not 1.6.0_01, whereas "1.5.0+" matches both.
+      *
+      * If the versionPattern does not include all four version components 
+      * but does not end with a star or plus, it will be treated as if it 
+      * ended with a star.  "1.5" is exactly equivalent to "1.5*", and will 
+      * match any version number beginning with "1.5".
+      *
+      * If getJREs() is unable to detect the precise version number, a match 
+      * could be ambiguous.  For example if getJREs() detects "1.5", there is 
+      * no way to know whether the JRE matches "1.5.0_06+".  versionCheck() 
+      * compares only as much of the version information as could be detected, 
+      * so versionCheck("1.5.0_06+") would return true in in this case.
+      *
+      * Invalid versionPattern will result in a JavaScript error alert.  
+      * versionPatterns which are valid but do not match any existing JRE 
+      * release (e.g. "32.65+") will always return false.
+      */
+    versionCheck: function(versionPattern)
+    {
+        var index = 0;
+        var regex = "^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+)(?:_(\\d+))?)?)?(\\*|\\+)?$";
+
+        var matchData = versionPattern.match(regex);
+
+        if (matchData != null) {
+            var familyMatch = true;
+
+            var patternArray = new Array();
+
+            for (var i = 1; i < matchData.length; ++i) {
+                // browser dependency here.
+                // Fx sets 'undefined', IE sets '' string for unmatched groups
+                if ((typeof matchData[i] == 'string') && (matchData[i] != '')) {
+                    patternArray[index] = matchData[i];
+                    index++;
+                }
+            }
+
+            if (patternArray[patternArray.length-1] == '+') {
+                familyMatch = false;
+                patternArray.length--;
+            } else {
+                if (patternArray[patternArray.length-1] == '*') {
+                    patternArray.length--;
+                }
+            }
+
+            var list = deployJava.getJREs();       
+            for (var i = 0; i < list.length; ++i) {
+                if (deployJava.compareVersionToPattern(list[i], patternArray, 
+                                                       familyMatch)) {
+                    return true;
+                }
+            }
+  
+            return false;
+        } else {
+            alert('Invalid versionPattern passed to versionCheck: ' + 
+                  versionPattern);
+            return false;
+        }
+    },
+
+
+    /**
+     * Returns true if an installation of Java Web Start of the specified 
+     * minimumVersion can be detected.  minimumVersion is optional, and 
+     * if not specified, '1.4.2' will be used. 
+     * (Versions earlier than 1.4.2 may not be detected.)
+     */
+    isWebStartInstalled: function(minimumVersion) {
+
+        var browser = deployJava.getBrowser();
+        if ((browser == '?') || (browser == 'Safari')) {
+            // we really don't know - better to try to use it than reinstall
+            return true;
+        }
+
+        if (minimumVersion == 'undefined' || minimumVersion == null) {
+            minimumVersion = '1.4.2';
+        }
+
+        var retval = false;
+        var regex = "^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+)(?:_(\\d+))?)?)?$";
+        var matchData = minimumVersion.match(regex);
+
+        if (matchData != null) {
+            retval = deployJava.versionCheck(minimumVersion + '+');
+        } else {
+            if (deployJava.debug) {
+                alert('Invalid minimumVersion argument to isWebStartInstalled(): ' + minimumVersion);
+            }
+            retval = deployJava.versionCheck('1.4.2+');
+        }
+        return retval;
+    },
+  
+  
+    /**
+     * Outputs a launch button for the specified JNLP URL.  When clicked, the 
+     * button will ensure that an appropriate JRE is installed and then launch 
+     * the JNLP application.  minimumVersion is of the form #[.#[.#[_#]]], and 
+     * is the minimum JRE version necessary to run this JNLP application.  
+     * minimumVersion is optional, and if it is not specified, '1.4.2' 
+     * will be used.
+     * If an appropriate JRE or Web Start installation is detected, 
+     * the JNLP application will be launched, otherwise installLatestJRE() 
+     * will be called.
+     *
+     * After installLatestJRE() is called, the script will attempt to detect 
+     * that the JRE installation has completed and launch the JNLP application,
+     * but there are circumstances (such as when the JRE installation 
+     * requires a browser restart) when this cannot be fulfilled.
+     */
+    createWebStartLaunchButton: function(jnlp, minimumVersion) { 
+
+        if (deployJava.returnPage == null) {
+            // if there is an install, come back and run the jnlp file
+            deployJava.returnPage = jnlp;
+        }
+
+        var url = 'javascript:' +
+                  'if (!deployJava.isWebStartInstalled(&quot;' + 
+                      minimumVersion + '&quot;)) {' + 
+                      'if (deployJava.installLatestJRE()) {' + 
+                        'if (deployJava.launch(&quot;' + jnlp + '&quot;)) {}' +
+                      '}' +
+                  '} else {' +
+                      'if (deployJava.launch(&quot;' + jnlp + '&quot;)) {}' +
+                  '}';
+
+        document.write('<' + 'a href="' + url + 
+                       '" onMouseOver="window.status=\'\'; ' +
+                       'return true;"><' + 'img ' +
+                       'src="' + deployJava.launchButtonPNG + '" ' + 
+                       'border="0" /><' + '/' + 'a' + '>');
+    },
+
+
+    /**
+     * Launch a JNLP application, (using the plugin if available)
+     */
+    launch: function(jnlp) {
+        if (deployJava.isPluginInstalled()) {
+            return deployJava.getPlugin().launch(jnlp);
+        } else {
+            document.location=jnlp;
+            return true;
+        }
+    },
+
+    
+    /*
+     * returns true if the ActiveX or XPI plugin is installed
+     */
+    isPluginInstalled: function() {
+        var plugin = deployJava.getPlugin();
+        if (plugin && plugin.jvms) {
+            return true;
+        } else {
+            return false;
+        }
+    },
+    
+    /* 
+     * returns true if the plugin is installed and AutoUpdate is enabled
+     */
+    isAutoUpdateEnabled: function() {
+        if (deployJava.isPluginInstalled()) {
+            return deployJava.getPlugin().isAutoUpdateEnabled();
+        }
+        return false;
+    },
+
+    /* 
+     * sets AutoUpdate on if plugin is installed
+     */
+    setAutoUpdateEnabled: function() { 
+        if (deployJava.isPluginInstalled()) { 
+            return deployJava.getPlugin().setAutoUpdateEnabled(); 
+        }
+        return false;
+    },
+
+    /*
+     * sets the preferred install type : null, online, kernel
+     */
+    setInstallerType: function(type) {
+        deployJava.installType = type;
+        if (deployJava.isPluginInstalled()) {
+            return deployJava.getPlugin().setInstallerType(type);
+        }
+        return false;
+    },
+
+    /*
+     * sets additional package list - to be used by kernel installer
+     */
+    setAdditionalPackages: function(packageList) {
+        if (deployJava.isPluginInstalled()) {
+            return deployJava.getPlugin().setAdditionalPackages(
+                                                     packageList);
+        }
+        return false;
+    },
+
+    /*
+     * sets preference to install Early Access versions if available
+     */
+    setEarlyAccess: function(enabled) {
+        deployJava.EAInstallEnabled = enabled;
+    },
+
+    /*
+     * Determines if the next generation plugin (Plugin II) is default
+     */
+    isPlugin2: function() {
+        if (deployJava.isPluginInstalled()) {
+            try {
+                return deployJava.getPlugin().isPlugin2();
+            } catch (err) {
+                // older plugin w/o isPlugin2() function - just fall through
+            }
+        }
+        return false;
+    },
+       
+
+    getPlugin: function() {
+        deployJava.refresh();
+        var ret = document.getElementById('deployJavaPlugin');
+        return ret;
+    },
+
+    compareVersionToPattern: function(version, patternArray, familyMatch) {
+        var regex = "^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+)(?:_(\\d+))?)?)?$";
+        var matchData = version.match(regex);  
+
+        if (matchData != null) { 
+            var index = 0;
+            var result = new Array();
+
+            for (var i = 1; i < matchData.length; ++i) {
+                if ((typeof matchData[i] == 'string') && (matchData[i] != ''))
+                {
+                    result[index] = matchData[i];
+                    index++;
+                }
+            }
+
+            var l = Math.min(result.length, patternArray.length);
+
+            if (familyMatch) {
+                for (var i = 0; i < l; ++i) {
+                    if (result[i] != patternArray[i]) return false;
+                }
+
+                return true;
+            } else {
+                for (var i = 0; i < l; ++i) {
+                    if (result[i] < patternArray[i]) {
+                        return false;
+                    } else if (result[i] > patternArray[i]) {
+                        return true;
+                    }
+                }
+                
+                return true;
+            }
+        } else {
+            return false;
+        }
+    },
+
+  
+    getBrowser: function() {
+        var browser = navigator.userAgent.toLowerCase();
+    
+        if (deployJava.debug) {
+            alert('userAgent -> ' + browser);
+        }
+    
+        if ((navigator.vendor) && 
+            (navigator.vendor.toLowerCase().indexOf('apple') != -1) &&
+            (browser.indexOf('safari') != -1)) {
+            if (deployJava.debug) {
+                alert('We claim to have detected "Safari".');
+            }
+            return 'Safari';
+        } else if (browser.indexOf('msie') != -1) {
+            if (deployJava.debug) {
+                alert('We claim to have detected "IE".');
+            }
+            return 'MSIE';
+        } else if ((browser.indexOf('mozilla') != -1) || 
+                   (browser.indexOf('firefox') != -1)) {
+            if (deployJava.debug) {
+                alert('We claim to have detected a Netscape family browser.');
+            }
+            return 'Netscape Family';
+        } else {
+            if (deployJava.debug) {
+                alert('We claim to have failed to detect a browser.');
+            }
+            return '?';
+        }
+    },
+    
+    
+    testUsingActiveX: function(version) {
+        var objectName = 'JavaWebStart.isInstalled.' + version + '.0';
+    
+        if (!ActiveXObject) {
+            if (deployJava.debug) {
+              alert ('Browser claims to be IE, but no ActiveXObject object?');
+            }
+            return false;
+        }
+    
+        try {
+            return (new ActiveXObject(objectName) != null);
+        } catch (exception) {
+            return false;
+        }
+    },
+    
+
+    testForMSVM: function() {
+        var clsid = '{08B0E5C0-4FCB-11CF-AAA5-00401C608500}';
+
+        if (typeof oClientCaps != 'undefined') {
+            var v = oClientCaps.getComponentVersion(clsid, "ComponentID");
+            if ((v == '') || (v == '5,0,5000,0')) {
+                return false;
+            } else {
+                return true;
+            } 
+        } else {
+            return false;
+        }
+    },
+
+    
+    testUsingMimeTypes: function(version) {
+        if (!navigator.mimeTypes) {
+            if (deployJava.debug) {
+                alert ('Browser claims to be Netscape family, but no mimeTypes[] array?');
+            }
+            return false;
+        }
+    
+        for (var i = 0; i < navigator.mimeTypes.length; ++i) {
+            s = navigator.mimeTypes[i].type;
+            var m = s.match(/^application\/x-java-applet\x3Bversion=(1\.8|1\.7|1\.6|1\.5|1\.4\.2)$/);
+            if (m != null) {
+                if (deployJava.compareVersions(m[1], version)) {
+                    return true;   
+                }
+            }
+        }
+        return false;
+    },
+    
+    
+    testUsingPluginsArray: function(version) {
+        if ((!navigator.plugins) || (!navigator.plugins.length)) {
+            if (deployJava.debug) {
+                alert ('Browser claims to be Safari, but no plugins[] array?');
+            }
+            return false;
+        }
+
+        for (var i = 0; i < navigator.plugins.length; ++i) {
+            s = navigator.plugins[i].description;
+    
+            if (s.search(/^Java Switchable Plug-in/) != -1) {
+                return true;
+            }
+    
+            m = s.match(/^Java (1\.4\.2|1\.5|1\.6|1\.7).* Plug-in/);
+            if (m != null) {
+                if (deployJava.compareVersions(m[1], version)) return true; 
+            }
+        }
+        return false;
+    },
+    
+    IEInstall: function() {
+    
+        location.href = deployJava.getJavaURL + 
+            ((deployJava.returnPage != null) ?
+            ('&returnPage=' + deployJava.returnPage) : '') +
+            ((deployJava.locale != null) ?
+            ('&locale=' + deployJava.locale) : '') +
+            ((deployJava.brand != null) ? ('&brand=' + deployJava.brand) : '') +
+            ((deployJava.installType != null) ? 
+             ('&type=' + deployJava.installType) : '');
+
+         // should not actually get here
+         return false;
+    },
+    
+    done: function (name, result) {
+    },
+    
+    FFInstall: function() {
+
+        location.href = deployJava.getJavaURL + 
+            ((deployJava.returnPage != null) ?
+            ('&returnPage=' + deployJava.returnPage) : '') +
+            ((deployJava.locale != null) ?
+            ('&locale=' + deployJava.locale) : '') +
+            ((deployJava.brand != null) ? ('&brand=' + deployJava.brand) : '') +
+            ((deployJava.installType != null) ? 
+                ('&type=' + deployJava.installType) : '');
+
+         // should not actually get here
+         return false;
+    },
+
+    // return true if 'installed' (considered as a JRE version string) is
+    // greater than or equal to 'required' (again, a JRE version string).
+    compareVersions: function(installed, required) {
+
+        var a = installed.split('.');
+        var b = required.split('.');
+    
+        for (var i = 0; i < a.length; ++i) {
+            a[i] = Number(a[i]);
+        }
+        for (var i = 0; i < b.length; ++i) {
+            b[i] = Number(b[i]);
+        }
+        if (a.length == 2) {
+            a[2] = 0;      
+        }
+    
+        if (a[0] > b[0]) return true;
+        if (a[0] < b[0]) return false;
+    
+        if (a[1] > b[1]) return true;
+        if (a[1] < b[1]) return false;
+    
+        if (a[2] > b[2]) return true;
+        if (a[2] < b[2]) return false;
+    
+        return true;
+    },
+    
+    
+    enableAlerts: function() {
+        deployJava.debug = true;
+    },
+
+    poll: function() {
+
+        deployJava.refresh();
+        var postInstallJREList = deployJava.getJREs();           
+
+        if ((deployJava.preInstallJREList.length == 0) && 
+            (postInstallJREList.length != 0)) {
+            clearInterval(deployJava.myInterval);
+            if (deployJava.returnPage != null) {
+                location.href = deployJava.returnPage;
+            };
+        }
+
+        if ((deployJava.preInstallJREList.length != 0) && 
+            (postInstallJREList.length != 0) &&
+            (deployJava.preInstallJREList[0] != postInstallJREList[0])) {
+            clearInterval(deployJava.myInterval);
+            if (deployJava.returnPage != null) {
+                location.href = deployJava.returnPage;
+            }
+        }
+
+    },
+    
+    writePluginTag: function() {
+        var browser = deployJava.getBrowser();
+        if (browser == 'MSIE') {
+            document.write('<' + 
+                'object classid="clsid:CAFEEFAC-DEC7-0000-0000-ABCDEFFEDCBA" ' +
+                'id="deployJavaPlugin" width="0" height="0">' +
+                '<' + '/' + 'object' + '>');
+        } else if (browser == 'Netscape Family') {
+            if (navigator.mimeTypes != null) for (var i=0; 
+                    i < navigator.mimeTypes.length; i++) {
+                if (navigator.mimeTypes[i].type == deployJava.mimeType) {
+                    if (navigator.mimeTypes[i].enabledPlugin) {
+                        document.write('<' + 
+                            'embed id="deployJavaPlugin" type="' + 
+                            deployJava.mimeType + '" hidden="true" />');
+                    }
+                }
+           }
+        }
+    },
+
+    refresh: function() {
+        navigator.plugins.refresh(false);
+
+        var browser = deployJava.getBrowser();
+        if (browser == 'Netscape Family') {
+            var plugin = document.getElementById('deployJavaPlugin');
+            // only do this again if no plugin
+            if (plugin == null) {
+                if (navigator.mimeTypes != null) for (var i=0;
+                    i < navigator.mimeTypes.length; i++) {
+                    if (navigator.mimeTypes[i].type == deployJava.mimeType) {
+                        if (navigator.mimeTypes[i].enabledPlugin) {
+                            document.write('<' +
+                                'embed id="deployJavaPlugin" type="' +
+                                deployJava.mimeType + '" hidden="true" />');
+                        }
+                    }
+               }
+            }
+        }
+    },
+
+    do_initialize: function() {
+        deployJava.writePluginTag();
+        if (deployJava.locale == null) {
+            var loc = null;
+
+            if (loc == null) try {
+                loc = navigator.userLanguage;
+            } catch (err) { }
+
+            if (loc == null) try {
+                loc = navigator.systemLanguage;
+            } catch (err) { }
+    
+            if (loc == null) try {
+                loc = navigator.language;
+            } catch (err) { }
+    
+            if (loc != null) {
+                loc.replace("-","_")
+                deployJava.locale = loc;
+            }
+        }
+    }
+      
+};
+deployJava.do_initialize();
+
diff --git a/id/server/auth/src/main/webapp/template_handyBKU.html b/id/server/auth/src/main/webapp/template_handyBKU.html
new file mode 100644
index 000000000..a89377153
--- /dev/null
+++ b/id/server/auth/src/main/webapp/template_handyBKU.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="de">
+	<head>
+		<title></title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<script language="javascript" type="text/javascript">
+			function onAnmeldeSubmit() {
+				document.CustomizedForm.submit();
+				document.CustomizedForm.Senden.disabled=true;
+			}
+		</script>
+	</head>
+	<body onLoad="onAnmeldeSubmit()">
+		<form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data<>">
+			<input class="button" type="hidden" value="Starte Authentisierung" name="Senden">
+			<input type="hidden" name="XMLRequest" value="<XMLRequest>">
+			<input type="hidden" name="DataURL" value="<DataURL>">
+			<input type="hidden" name="PushInfobox" value="<PushInfobox>">
+			
+			<!-- Angabe der Parameter für die Handy-BKU -->
+			<input type="hidden" name="appletWidth" value="210">
+			<input type="hidden" name="appletHeight" value="149">
+			
+			<!-- [OPTIONAL] Aendern Sie hier die Hintergrundfarbe der Handy-BKU -->
+			<input type="hidden" name="backgroundColor" value="#FFBBCB "> 
+            
+			<input type="hidden" name="redirecttarget" value="_parent">
+		</form>
+
+		<form name="CustomizedInfoForm" action="<BKU>" method="post">
+			<input type="hidden" name="XMLRequest" value="<CertInfoXMLRequest>">
+			<input type="hidden" name="DataURL" value="<CertInfoDataURL>">
+		</form>
+		<form name="DummyForm" action="<BKU>" method="post">
+		</form>
+	</body>
+</html>
\ No newline at end of file
diff --git a/id/server/auth/src/main/webapp/template_localBKU.html b/id/server/auth/src/main/webapp/template_localBKU.html
new file mode 100644
index 000000000..e07ba5d52
--- /dev/null
+++ b/id/server/auth/src/main/webapp/template_localBKU.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="de">
+	<head>
+		<title></title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<script language="javascript" type="text/javascript">
+			function onAnmeldeSubmit() {
+				document.CustomizedForm.submit();
+				document.CustomizedForm.Senden.disabled=true;
+			}
+		</script>
+	</head>
+	<body onLoad="onAnmeldeSubmit()">
+		<form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data<>">
+			<input class="button" type="submit" value="Starte Authentisierung" name="Senden">
+			<input type="hidden" name="XMLRequest" value="<XMLRequest>">
+			<input type="hidden" name="DataURL" value="<DataURL>">
+			<input type="hidden" name="PushInfobox" value="<PushInfobox>">
+		</form>
+		
+		<form name="CustomizedInfoForm" action="<BKU>" method="post">
+			<input type="hidden" name="XMLRequest" value="<CertInfoXMLRequest>">
+			<input type="hidden" name="DataURL" value="<CertInfoDataURL>">
+		</form>
+		
+		<form name="DummyForm" action="<BKU>" method="post">
+		</form>
+	</body>
+</html>
diff --git a/id/server/auth/src/main/webapp/template_onlineBKU.html b/id/server/auth/src/main/webapp/template_onlineBKU.html
new file mode 100644
index 000000000..f4dda9830
--- /dev/null
+++ b/id/server/auth/src/main/webapp/template_onlineBKU.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="de">
+	<head>
+		<title></title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<script language="javascript" type="text/javascript">
+			function onAnmeldeSubmit() {
+				document.CustomizedForm.submit();
+				document.CustomizedForm.Senden.disabled=true;
+			}
+		</script>
+	</head>
+	<body onLoad="onAnmeldeSubmit()">
+		<form name="CustomizedForm" action="<BKU>" method="post" enctype="multipart/form-data<>">
+			<input class="button" type="hidden" value="Starte Authentisierung" name="Senden">
+			<input type="hidden" name="XMLRequest" value="<XMLRequest>">
+			<input type="hidden" name="DataURL" value="<DataURL>">
+			<input type="hidden" name="PushInfobox" value="<PushInfobox>">
+		
+			<!-- Angabe der Parameter fuer die Online-BKU -->
+			<input type="hidden" name="appletWidth" value="210">
+			<input type="hidden" name="appletHeight" value="130">
+			
+			<!-- [OPTIONAL] Aendern Sie hier die Hintergrundfarbe der Online-BKU -->
+	      <input type="hidden" name="appletBackgroundColor" value="#FFBBCB">
+		</form>
+		
+		<form name="CustomizedInfoForm" action="<BKU>" method="post">
+			<input type="hidden" name="XMLRequest" value="<CertInfoXMLRequest>">
+			<input type="hidden" name="DataURL" value="<CertInfoDataURL>">
+		</form>
+		<form name="DummyForm" action="<BKU>" method="post">
+		</form>
+	</body>
+</html>
-- 
cgit v1.2.3


From 5289de5862d5b3bacbca2f274f44c79d1f1dae5d Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Fri, 16 Jul 2010 07:33:54 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1174
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 id/server/auth/src/main/webapp/index.html       |  89 +--
 id/server/auth/src/main/webapp/js/browser.js    | 165 -----
 id/server/auth/src/main/webapp/js/deployJava.js | 898 ------------------------
 3 files changed, 25 insertions(+), 1127 deletions(-)
 delete mode 100644 id/server/auth/src/main/webapp/js/browser.js
 delete mode 100644 id/server/auth/src/main/webapp/js/deployJava.js

(limited to 'id/server/auth')

diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html
index cbe587f2e..46ac4dd86 100644
--- a/id/server/auth/src/main/webapp/index.html
+++ b/id/server/auth/src/main/webapp/index.html
@@ -8,80 +8,47 @@
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
         <meta http-equiv="Content-Style-Type" content="text/css">
         <link rel="stylesheet" type="text/css" href="css/index.css">
-        <script src="js/browser.js" type="text/javascript"></script>
-        <script src="js/deployJava.js" type="text/javascript"></script>
         <script type="text/javascript">
 			window.onload=function() {
 				document.getElementById("localBKU").style.display="none";
-				document.getElementById("installJava").style.display="none";
-				document.getElementById("BrowserNOK").style.display="none";
 				return;
         	}
 
 	        function bkuOnlineClicked() {
 				<!-- [OPTIONAL] Um die lokale BKU auszublenden, ersetzen Sie in der folgenden Zeile "block" durch "none" -->
 				document.getElementById("localBKU").style.display="block"; 
- 				document.getElementById("installJava").style.display="none";
-        		document.getElementById("BrowserNOK").style.display="none";
 
 		        var el = document.getElementById("bkulogin");
         		var parent = el.parentNode;
 				
-		        if ( navigator.javaEnabled() && ( deployJava.versionCheck("1.6.0_11+") || (  BrowserDetect.browser.toLowerCase() == "safari" && navigator.platform.toLowerCase().indexOf('win')==0 ))) {
-		      
-				
-        			if( BrowserDetect.browser.toLowerCase() != "explorer" && BrowserDetect.browser.toLowerCase() != "firefox" && BrowserDetect.browser.toLowerCase() != "mozilla") {
-				        alert("Hinweis! \nUm die Online BKU verwenden zu koennen benoetigen Sie Java 1.6 oder hoeher.");
-			        }
-		
-			 		var iframe = document.createElement("iframe");
-			        iframe.setAttribute("src", "iframeOnlineBKU.html");
-			        iframe.setAttribute("width", "210");
-			        iframe.setAttribute("height", "150");
-			        iframe.setAttribute("frameborder", "0");
-			        iframe.setAttribute("scrolling", "no");
-			        iframe.setAttribute("title", "Login");
-
-			        parent.replaceChild(iframe, el);
-        		} 
-				else {
+		 		var iframe = document.createElement("iframe");
+		        iframe.setAttribute("src", "iframeOnlineBKU.html");
+		        iframe.setAttribute("width", "210");
+		        iframe.setAttribute("height", "150");
+		        iframe.setAttribute("frameborder", "0");
+		        iframe.setAttribute("scrolling", "no");
+		        iframe.setAttribute("title", "Login");
 
-			        okbrowser=true;
-			        if( BrowserDetect.browser.toLowerCase() == "explorer" ||BrowserDetect.browser.toLowerCase() == "firefox" || BrowserDetect.browser.toLowerCase() == "safari" || BrowserDetect.browser.toLowerCase() == "mozilla")    {
-				        okbrowser=true;
-        			} 
-        			else {
-        				okbrowser=false;
-        		}
-				
-				if(okbrowser==true) {  
-        			parent.removeChild(el);
-			        document.getElementById("installJava").style.display="block";
-        		} else {
-       				parent.removeChild(el);
-			        document.getElementById("BrowserNOK").style.display="block";
-        		}
+		        parent.replaceChild(iframe, el);
         	}
-        }
-
-        function bkuHandyClicked() {
-	        document.getElementById("localBKU").style.display="none";
-    	    document.getElementById("installJava").style.display="none";
-        	document.getElementById("BrowserNOK").style.display="none";
+        
 
-	        var el = document.getElementById("bkulogin");
-    	    var parent = el.parentNode;
-         
-        	var iframe = document.createElement("iframe");
-	        iframe.setAttribute("src", "iframeHandyBKU.html");
-    	    iframe.setAttribute("width", "210");
-        	iframe.setAttribute("height", "149");
-	        iframe.setAttribute("frameborder", "0");
-        	iframe.setAttribute("scrolling", "no");
-    	    iframe.setAttribute("title", "Login");
-
-	        parent.replaceChild(iframe, el);
-        }
+        	function bkuHandyClicked() {
+	        	document.getElementById("localBKU").style.display="none";
+    	    	
+		        var el = document.getElementById("bkulogin");
+	    	    var parent = el.parentNode;
+		         
+	        	var iframe = document.createElement("iframe");
+		        iframe.setAttribute("src", "iframeHandyBKU.html");
+	    	    iframe.setAttribute("width", "210");
+	        	iframe.setAttribute("height", "149");
+		        iframe.setAttribute("frameborder", "0");
+	        	iframe.setAttribute("scrolling", "no");
+	    	    iframe.setAttribute("title", "Login");
+	
+			    parent.replaceChild(iframe, el);
+			}
         </script>
     </head>
     <body>
@@ -121,12 +88,6 @@
                         </div> 
                     </div>
 
-                    <div id="installJava" style="display:none" class="hell">
-                        Um die Online BKU verwenden zu koennen benoetigen Sie die aktuellste Version von Java 1.6 oder hoeher. Unter <a href="http://java.sun.com/webapps/getjava/BrowserRedirect?host=java.com" target="_blank">http://java.sun.com/</a> koennen sie Java herunterladen. Sie bekommen diese Meldung auch, wenn Java in den Browser Einstellungen deaktiviert wurde.                    </div>
-
-                    <div id="BrowserNOK" style="display:none" class="hell">
-                        Der von Ihnen verwendete Browser wird derzeit nicht unterstuetzt. Fuer nicht kompatible Browser verwenden Sie bitte den Button Lokale BKU. Um die Online BKU verwenden zu koennen verwenden Sie bitte Internet Explorer, Firefox, Safari oder Google Chrome in der aktuellsten Version.                    </div>
-
                     <div id="localBKU" style="display:none" class="hell">
                         <hr>
                         <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an -->
diff --git a/id/server/auth/src/main/webapp/js/browser.js b/id/server/auth/src/main/webapp/js/browser.js
deleted file mode 100644
index 6fbf74f0a..000000000
--- a/id/server/auth/src/main/webapp/js/browser.js
+++ /dev/null
@@ -1,165 +0,0 @@
-var BrowserDetect = {
-	init: function () {
-		this.browser = this.searchString(this.dataBrowser) || "An unknown browser";
-		this.version = this.searchVersion(navigator.userAgent)
-			|| this.searchVersion(navigator.appVersion)
-			|| "an unknown version";
-		this.OS = this.searchString(this.dataOS) || "an unknown OS";
-	},
-	searchString: function (data) {
-		for (var i=0;i<data.length;i++)	{
-			var dataString = data[i].string;
-			var dataProp = data[i].prop;
-			this.versionSearchString = data[i].versionSearch || data[i].identity;
-			if (dataString) {
-				if (dataString.indexOf(data[i].subString) != -1)
-					return data[i].identity;
-			}
-			else if (dataProp)
-				return data[i].identity;
-		}
-	},
-	searchVersion: function (dataString) {
-		var index = dataString.indexOf(this.versionSearchString);
-		if (index == -1) return;
-		return parseFloat(dataString.substring(index+this.versionSearchString.length+1));
-	},
-	dataBrowser: [
-		{ 	string: navigator.userAgent,
-			subString: "OmniWeb",
-			versionSearch: "OmniWeb/",
-			identity: "OmniWeb"
-		},
-		{
-			string: navigator.vendor,
-			subString: "Apple",
-			identity: "Safari"
-		},
-		{
-			prop: window.opera,
-			identity: "Opera"
-		},
-		{
-			string: navigator.vendor,
-			subString: "iCab",
-			identity: "iCab"
-		},
-		{
-			string: navigator.vendor,
-			subString: "KDE",
-			identity: "Konqueror"
-		},
-		{
-			string: navigator.userAgent,
-			subString: "Firefox",
-			identity: "Firefox"
-		},
-		{
-			string: navigator.vendor,
-			subString: "Camino",
-			identity: "Camino"
-		},
-		{		// for newer Netscapes (6+)
-			string: navigator.userAgent,
-			subString: "Netscape",
-			identity: "Netscape"
-		},
-		{
-			string: navigator.userAgent,
-			subString: "MSIE",
-			identity: "Explorer",
-			versionSearch: "MSIE"
-		},
-		{
-			string: navigator.userAgent,
-			subString: "Gecko",
-			identity: "Mozilla",
-			versionSearch: "rv"
-		},
-		{ 		// for older Netscapes (4-)
-			string: navigator.userAgent,
-			subString: "Mozilla",
-			identity: "Netscape",
-			versionSearch: "Mozilla"
-		}
-	],
-	dataOS : [
-		{
-			string: navigator.platform,
-			subString: "Win",
-			identity: "Windows"
-		},
-		{
-			string: navigator.platform,
-			subString: "Mac",
-			identity: "Mac"
-		},
-		{
-			string: navigator.platform,
-			subString: "Linux",
-			identity: "Linux"
-		}
-	]
-
-};
-BrowserDetect.init();
-function writeBrowser() {
-
-nok=false;
-			if(BrowserDetect.browser.toLowerCase() == "explorer") {
-			if(eval(BrowserDetect.version) < 6) {
-				nok=true;
-			} 
-		}
-		if(BrowserDetect.browser.toLowerCase() == "opera") {
-			if(eval(BrowserDetect.version) < 9) {
-				nok=true;
-			}
-		}	
-		if(BrowserDetect.browser.toLowerCase() == "firefox") {
-			if(eval(BrowserDetect.version) < 1.5) {
-				nok=true;
-			} 
-		}	
-
- if (nok==true) {
- 
-		document.write("<TABLE BORDER=0 CELLPADDING=0 WIDTH='100%'><TR><TD VALIGN=TOP WIDTH='85%' BGCOLOR='#003399'><TABLE id='erlaeut' BORDER=1"); 
-		document.write("CELLSPACING=5 CELLPADDING=2 WIDTH='100%' ><TR><TD WIDTH='100%' BGCOLOR='#FFFFFF'><FONT COLOR='#000000'>");
-		document.write("Sehr geehrter FinanzOnline-Teilnehmer!<p>Die Men&uuml;f&uuml;hrung in FinanzOnline wurde aus technischen Gr&uuml;nden ge&auml;ndert. Da Sie m&ouml;glicherweise eine veraltete und nicht mehr dem letzten Sicherheitsstandard entsprechende Version Ihres Webbrowsers verwenden, besteht ab diesem Zeitpunkt die M&ouml;glichkeit, dass das Men&uuml; in FinanzOnline nicht richtig angezeigt werden kann.</p><p>Wir empfehlen daher bereits heute auch zu Ihrer Sicherheit, ein Update auf die aktuell g&uuml;ltige Browserversion durchzuf&uuml;hren. Die unterst&uuml;tzten Webbrowser finden Sie auf der <a href='https://www.bmf.gv.at/EGovernment/FINANZOnline/Browsereinstellungen/_start.htm' target='_blank'>BMF-Homepage unter 'E-Government'/'FinanzOnline'/'Browsereinstellungen'</a>.</p>");
-		
-		
-/*		document.write("Verwendeter Browser: " + BrowserDetect.browser + " " + BrowserDetect.version + " / " + BrowserDetect.OS);
-		if(BrowserDetect.browser.toLowerCase() == "explorer") {
-			if(eval(BrowserDetect.version) < 6) {
-				document.write("<font color='red'> *** nicht supported ***</font>");
-			} else {
-				//document.write("<font color='green'> *** supported ***</font>");
-			}
-		}
-		if(BrowserDetect.browser.toLowerCase() == "opera") {
-			if(eval(BrowserDetect.version) < 9) {
-				document.write("<font color='red'> *** nicht supported ***</font>");
-			} else {
-				//document.write("<font color='green'> *** supported ***</font>");
-			}
-		}	
-		if(BrowserDetect.browser.toLowerCase() == "firefox") {
-			if(eval(BrowserDetect.version) < 1.5) {
-				document.write("<font color='red'> *** nicht supported ***</font>");
-			} else {
-				//document.write("<font color='green'> *** supported ***</font>");
-			}
-		}	
-//		document.write("<br><br>Vorschlag für unterstütze Browser:<br>");
-//		document.write("<ul><li>Internet Explorer 6, PC</li>");
-//		document.write("<li>Internet Explorer 7, PC</li>");
-//		document.write("<li>Firefox (>= 1.5), PC + Mac + Linux</li>");
-//		document.write("<li>Safari (>= 1.3+), Mac (<- WIE TESTEN??)</li>");
-//		document.write("<li>Opera (>= 9), PC + Mac + Linux</li>");
-//		document.write("</ul>");
-*/
-		document.write("</FONT></TD></TR></TABLE></TD></TR><TR><TD WIDTH='85%'>&nbsp;</TD></TR></TABLE>");
-		
- }		
-}
\ No newline at end of file
diff --git a/id/server/auth/src/main/webapp/js/deployJava.js b/id/server/auth/src/main/webapp/js/deployJava.js
deleted file mode 100644
index 0d4340c71..000000000
--- a/id/server/auth/src/main/webapp/js/deployJava.js
+++ /dev/null
@@ -1,898 +0,0 @@
-/*
- *  Copyright (c)  2008 Sun Microsystems, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- *   - Neither the name of Sun Microsystems nor the names of its
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * deployJava.js
- *
- * This file is part of the Deployment Toolkit.  It provides functions for web
- * pages to detect the presence of a JRE, install the latest JRE, and easily run
- * applets or Web Start programs.  Usage guide may be found at http://<TBD>/.
- * 
- * The "live" copy of this file may be found at 
- * http://java.com/js/deployJava.js.  
- * You are encouraged to link directly to the live copy of the file.
- *
- * @version @(#)deployJava.js	1.13 08/10/28
- */
-
-var deployJava = {
-    debug: null,
-
-    myInterval: null,
-    preInstallJREList: null,
-    returnPage: null,
-    brand: null,
-    locale: null,
-    installType: null,
-    
-    EAInstallEnabled: false,
-    EarlyAccessURL: null,
-    
-    // GetJava page
-    getJavaURL: 'http://java.sun.com/webapps/getjava/BrowserRedirect?host=java.com',
-    
-    // Apple redirect page
-    appleRedirectPage: 'http://www.apple.com/support/downloads/',
-
-    // mime-type of the DeployToolkit plugin object
-    mimeType: 'application/npruntime-scriptable-plugin;DeploymentToolkit',
-
-    // location of the Java Web Start launch button graphic
-    launchButtonPNG: 'http://java.sun.com/products/jfc/tsc/articles/swing2d/webstart.png',
-
-
-    /**
-     * Returns an array of currently-installed JRE version strings.  
-     * Version strings are of the form #.#[.#[_#]], with the function returning
-     * as much version information as it can determine, from just family 
-     * versions ("1.4.2", "1.5") through the full version ("1.5.0_06").
-     *
-     * Detection is done on a best-effort basis.  Under some circumstances 
-     * only the highest installed JRE version will be detected, and 
-     * JREs older than 1.4.2 will not always be detected.
-     */
-    getJREs: function() {
-        var list = new Array();
-        if (deployJava.isPluginInstalled()) {
-         var plugin =  deployJava.getPlugin();
-/*  			for (var i = 0; i < plugin.jvms.getLength(); i++) {
-                list[i] = plugin.jvms.get(i).version;
-            }
- */		/*bug fix firefox */
-            var jvms = plugin.jvms;
-            for (var i = 0; i < jvms.getLength(); i++) {
-            list[i] = jvms.get(i).version;
-            } 
-        } else {
-            var browser = deployJava.getBrowser();
-        
-            if (browser == 'MSIE') {
-                if (deployJava.testUsingActiveX('1.8.0')) {
-                    list[0] = '1.8.0';
-                } else if (deployJava.testUsingActiveX('1.7.0')) {
-                    list[0] = '1.7.0';
-                } else if (deployJava.testUsingActiveX('1.6.0')) {
-                    list[0] = '1.6.0';
-                } else if (deployJava.testUsingActiveX('1.5.0')) {
-                    list[0] = '1.5.0';
-                } else if (deployJava.testUsingActiveX('1.4.2')) {
-                    list[0] = '1.4.2';
-                } else if (deployJava.testForMSVM()) {
-                    list[0] = '1.1';
-                }
-            }
-            else if (browser == 'Netscape Family') {
-                if (deployJava.testUsingMimeTypes('1.8')) {
-                    list[0] = '1.8.0';
-                } else if (deployJava.testUsingMimeTypes('1.7')) {
-                    list[0] = '1.7.0';
-                } else if (deployJava.testUsingMimeTypes('1.6')) {
-                    list[0] = '1.6.0';
-                } else if (deployJava.testUsingMimeTypes('1.5')) {
-                    list[0] = '1.5.0';
-                } else if (deployJava.testUsingMimeTypes('1.4.2')) {
-                    list[0] = '1.4.2';
-                }
-            } else if (browser == 'Safari') {
-                if (deployJava.testUsingPluginsArray('1.8.0')) {
-                    list[0] = '1.8.0';
-                } else if (deployJava.testUsingPluginsArray('1.7.0')) {
-                    list[0] = '1.7.0';
-                } else if (deployJava.testUsingPluginsArray('1.6.0')) {
-                    list[0] = '1.6.0';
-                } else if (deployJava.testUsingPluginsArray('1.5.0')) {
-                    list[0] = '1.5.0';
-                } else if (deployJava.testUsingPluginsArray('1.4.2')) {
-                    list[0] = '1.4.2';
-                }
-            }
-        }
-            
-        if (deployJava.debug) {
-            for (var i = 0; i < list.length; ++i) {
-                alert('We claim to have detected Java SE ' + list[i]);
-            }
-        }
-    
-        return list;
-    },
-    
-    /**
-     * Triggers a JRE installation.  The exact effect of triggering an 
-     * installation varies based on platform, browser, and if the 
-     * Deployment Toolkit plugin is installed.
-     *
-     * The requestVersion string is of the form #[.#[.#[_#]]][+|*], 
-     * which includes strings such as "1.4", "1.5.0*", and "1.6.0_02+".  
-     * A star (*) means "any version starting within this family" and 
-     * a plus (+) means "any version greater or equal to this".  
-     * "1.5.0*" * matches 1.5.0_06 but not 1.6.0_01, whereas 
-     * "1.5.0+" matches both.
-     *
-     * If the Deployment Toolkit plugin is not present, this will just call 
-     * deployJava.installLatestJRE(). 
-     */
-    installJRE: function(requestVersion) {
-        var ret = false;
-        if (deployJava.isPluginInstalled()) {
-            if (deployJava.getPlugin().installJRE(requestVersion)) {
-                deployJava.refresh();
-                if (deployJava.returnPage != null) {
-                    document.location = deployJava.returnPage;
-                }
-                return true;
-            } else {
-                return false;
-            }
-        } else {
-            return deployJava.installLatestJRE();
-        }
-    },
-
-
-    /**
-     * Triggers a JRE installation.  The exact effect of triggering an 
-     * installation varies based on platform, browser, and if the 
-     * Deployment Toolkit plugin is installed.
-     *
-     * In the simplest case, the browser window will be redirected to the 
-     * java.com JRE installation page, and (if possible) a redirect back to 
-     * the current URL upon successful installation.  The return redirect is 
-     * not always possible, as the JRE installation may require the browser to 
-     * be restarted.
-     *
-     * In the best case (when the Deployment Toolkit plugin is present), this
-     * function will immediately cause a progress dialog to be displayed 
-     * as the JRE is downloaded and installed.
-     */
-    installLatestJRE: function() {
-        if (deployJava.isPluginInstalled()) {
-            if (deployJava.getPlugin().installLatestJRE()) {
-                deployJava.refresh();
-                if (deployJava.returnPage != null) {
-                    document.location = deployJava.returnPage;
-                }
-                return true;
-            } else {
-                return false;
-            }
-        } else {
-            var browser = deployJava.getBrowser();
-            var platform = navigator.platform.toLowerCase();
-            if ((deployJava.EAInstallEnabled == 'true') && 
-                (platform.indexOf('win') != -1) && 
-                (deployJava.EarlyAccessURL != null)) {
-
-                deployJava.preInstallJREList = deployJava.getJREs();
-                if (deployJava.returnPage != null) {
-                    deployJava.myInterval = 
-                        setInterval("deployJava.poll()", 3000);
-                }
-
-                location.href = deployJava.EarlyAccessURL;
-
-                // we have to return false although there may be an install
-                // in progress now, when complete it may go to return page
-                return false;
-            } else {
-                if (browser == 'MSIE') {
-                    return deployJava.IEInstall();
-                } else if ((browser == 'Netscape Family') && 
-                           (platform.indexOf('win32') != -1)) {
-                    return deployJava.FFInstall();
-                } else {
-                    location.href = deployJava.getJavaURL + 
-                        ((deployJava.returnPage != null) ?
-                        ('&returnPage=' + deployJava.returnPage) : '') + 
-                        ((deployJava.locale != null) ?
-                        ('&locale=' + deployJava.locale) : '') +
-                        ((deployJava.brand != null) ? 
-                         ('&brand=' + deployJava.brand) : '');
-                }
-                // we have to return false although there may be an install
-                // in progress now, when complete it may go to return page
-                return false;
-            }
-        }
-    },
-
-
-    /**
-     * Ensures that an appropriate JRE is installed and then runs an applet.
-     * minimumVersion is of the form #[.#[.#[_#]]], and is the minimum 
-     * JRE version necessary to run this applet.  minimumVersion is optional, 
-     * defaulting to the value "1.1" (which matches any JRE).  
-     * If an equal or greater JRE is detected, runApplet() will call 
-     * writeAppletTag(attributes, parameters) to output the applet tag, 
-     * otherwise it will call installJRE(minimumVersion + '+').
-     *
-     * After installJRE() is called, the script will attempt to detect that the 
-     * JRE installation has completed and begin running the applet, but there
-     * are circumstances (such as when the JRE installation requires a browser
-     * restart) when this cannot be fulfilled.
-     *
-     * As with writeAppletTag(), this function should only be called prior to 
-     * the web page being completely rendered.  Note that version wildcards 
-     * (star (*) and plus (+)) are not supported, and including them in the 
-     * minimumVersion will result in an error message.
-     */
-    runApplet: function(attributes, parameters, minimumVersion) {
-        if (minimumVersion == 'undefined' || minimumVersion == null) {
-            minimumVersion = '1.1';
-        }
-
-        var regex = "^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+)(?:_(\\d+))?)?)?$";
-
-        var matchData = minimumVersion.match(regex);
-
-        if (deployJava.returnPage == null) {
-            // if there is an install, come back here and run the applet
-            deployJava.returnPage = document.location;
-        }
-
-        if (matchData != null) {
-            var browser = deployJava.getBrowser();
-            if ((browser != '?') && (browser != 'Safari')) {
-                if (deployJava.versionCheck(minimumVersion + '+')) {
-                    deployJava.writeAppletTag(attributes, parameters);
-                } else if (deployJava.installJRE(minimumVersion + '+')) {
-                    // after successfull install we need to refresh page to pick
-                    // pick up new plugin
-                    deployJava.refresh();
-                    location.href = document.location;
-                    deployJava.writeAppletTag(attributes, parameters);
-                }
-            } else {
-                // for unknown or Safari - just try to show applet
-                deployJava.writeAppletTag(attributes, parameters);
-            }
-        } else {
-            if (deployJava.debug) {
-                alert('Invalid minimumVersion argument to runApplet():' + 
-                      minimumVersion);
-            }
-        }
-    },
-
-    
-    /**
-     * Outputs an applet tag with the specified attributes and parameters, where
-     * both attributes and parameters are associative arrays.  Each key/value 
-     * pair in attributes becomes an attribute of the applet tag itself, while
-     * key/value pairs in parameters become <PARAM> tags.  No version checking 
-     * or other special behaviors are performed; the tag is simply written to 
-     * the page using document.writeln().
-     *
-     * As document.writeln() is generally only safe to use while the page is 
-     * being rendered, you should never call this function after the page 
-     * has been completed.
-     */
-    writeAppletTag: function(attributes, parameters) {
-        var s = '<' + 'applet ';
-        for (var attribute in attributes) {
-            s += (' ' + attribute + '="' + attributes[attribute] + '"');
-        }
-        s += '>';
-        document.write(s);
-    
-        if (parameters != 'undefined' && parameters != null) {
-            var codebaseParam = false;
-            for (var parameter in parameters) {
-                if (parameter == 'codebase_lookup') {
-                    codebaseParam = true;
-                }
-                s = '<param name="' + parameter + '" value="' + 
-                    parameters[parameter] + '">';
-                document.write(s);
-            }
-            if (!codebaseParam) {
-              document.write('<param name="codebase_lookup" value="false">');
-            }
-        }
-        document.write('<' + '/' + 'applet' + '>');
-    },
-    
-    
-     /**
-      * Returns true if there is a matching JRE version currently installed 
-      * (among those detected by getJREs()).  The versionPattern string is 
-      * of the form #[.#[.#[_#]]][+|*], which includes strings such as "1.4", 
-      * "1.5.0*", and "1.6.0_02+".  
-      * A star (*) means "any version within this family" and a plus (+) means 
-      * "any version greater or equal to the specified version".  "1.5.0*"
-      * matches 1.5.0_06 but not 1.6.0_01, whereas "1.5.0+" matches both.
-      *
-      * If the versionPattern does not include all four version components 
-      * but does not end with a star or plus, it will be treated as if it 
-      * ended with a star.  "1.5" is exactly equivalent to "1.5*", and will 
-      * match any version number beginning with "1.5".
-      *
-      * If getJREs() is unable to detect the precise version number, a match 
-      * could be ambiguous.  For example if getJREs() detects "1.5", there is 
-      * no way to know whether the JRE matches "1.5.0_06+".  versionCheck() 
-      * compares only as much of the version information as could be detected, 
-      * so versionCheck("1.5.0_06+") would return true in in this case.
-      *
-      * Invalid versionPattern will result in a JavaScript error alert.  
-      * versionPatterns which are valid but do not match any existing JRE 
-      * release (e.g. "32.65+") will always return false.
-      */
-    versionCheck: function(versionPattern)
-    {
-        var index = 0;
-        var regex = "^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+)(?:_(\\d+))?)?)?(\\*|\\+)?$";
-
-        var matchData = versionPattern.match(regex);
-
-        if (matchData != null) {
-            var familyMatch = true;
-
-            var patternArray = new Array();
-
-            for (var i = 1; i < matchData.length; ++i) {
-                // browser dependency here.
-                // Fx sets 'undefined', IE sets '' string for unmatched groups
-                if ((typeof matchData[i] == 'string') && (matchData[i] != '')) {
-                    patternArray[index] = matchData[i];
-                    index++;
-                }
-            }
-
-            if (patternArray[patternArray.length-1] == '+') {
-                familyMatch = false;
-                patternArray.length--;
-            } else {
-                if (patternArray[patternArray.length-1] == '*') {
-                    patternArray.length--;
-                }
-            }
-
-            var list = deployJava.getJREs();       
-            for (var i = 0; i < list.length; ++i) {
-                if (deployJava.compareVersionToPattern(list[i], patternArray, 
-                                                       familyMatch)) {
-                    return true;
-                }
-            }
-  
-            return false;
-        } else {
-            alert('Invalid versionPattern passed to versionCheck: ' + 
-                  versionPattern);
-            return false;
-        }
-    },
-
-
-    /**
-     * Returns true if an installation of Java Web Start of the specified 
-     * minimumVersion can be detected.  minimumVersion is optional, and 
-     * if not specified, '1.4.2' will be used. 
-     * (Versions earlier than 1.4.2 may not be detected.)
-     */
-    isWebStartInstalled: function(minimumVersion) {
-
-        var browser = deployJava.getBrowser();
-        if ((browser == '?') || (browser == 'Safari')) {
-            // we really don't know - better to try to use it than reinstall
-            return true;
-        }
-
-        if (minimumVersion == 'undefined' || minimumVersion == null) {
-            minimumVersion = '1.4.2';
-        }
-
-        var retval = false;
-        var regex = "^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+)(?:_(\\d+))?)?)?$";
-        var matchData = minimumVersion.match(regex);
-
-        if (matchData != null) {
-            retval = deployJava.versionCheck(minimumVersion + '+');
-        } else {
-            if (deployJava.debug) {
-                alert('Invalid minimumVersion argument to isWebStartInstalled(): ' + minimumVersion);
-            }
-            retval = deployJava.versionCheck('1.4.2+');
-        }
-        return retval;
-    },
-  
-  
-    /**
-     * Outputs a launch button for the specified JNLP URL.  When clicked, the 
-     * button will ensure that an appropriate JRE is installed and then launch 
-     * the JNLP application.  minimumVersion is of the form #[.#[.#[_#]]], and 
-     * is the minimum JRE version necessary to run this JNLP application.  
-     * minimumVersion is optional, and if it is not specified, '1.4.2' 
-     * will be used.
-     * If an appropriate JRE or Web Start installation is detected, 
-     * the JNLP application will be launched, otherwise installLatestJRE() 
-     * will be called.
-     *
-     * After installLatestJRE() is called, the script will attempt to detect 
-     * that the JRE installation has completed and launch the JNLP application,
-     * but there are circumstances (such as when the JRE installation 
-     * requires a browser restart) when this cannot be fulfilled.
-     */
-    createWebStartLaunchButton: function(jnlp, minimumVersion) { 
-
-        if (deployJava.returnPage == null) {
-            // if there is an install, come back and run the jnlp file
-            deployJava.returnPage = jnlp;
-        }
-
-        var url = 'javascript:' +
-                  'if (!deployJava.isWebStartInstalled(&quot;' + 
-                      minimumVersion + '&quot;)) {' + 
-                      'if (deployJava.installLatestJRE()) {' + 
-                        'if (deployJava.launch(&quot;' + jnlp + '&quot;)) {}' +
-                      '}' +
-                  '} else {' +
-                      'if (deployJava.launch(&quot;' + jnlp + '&quot;)) {}' +
-                  '}';
-
-        document.write('<' + 'a href="' + url + 
-                       '" onMouseOver="window.status=\'\'; ' +
-                       'return true;"><' + 'img ' +
-                       'src="' + deployJava.launchButtonPNG + '" ' + 
-                       'border="0" /><' + '/' + 'a' + '>');
-    },
-
-
-    /**
-     * Launch a JNLP application, (using the plugin if available)
-     */
-    launch: function(jnlp) {
-        if (deployJava.isPluginInstalled()) {
-            return deployJava.getPlugin().launch(jnlp);
-        } else {
-            document.location=jnlp;
-            return true;
-        }
-    },
-
-    
-    /*
-     * returns true if the ActiveX or XPI plugin is installed
-     */
-    isPluginInstalled: function() {
-        var plugin = deployJava.getPlugin();
-        if (plugin && plugin.jvms) {
-            return true;
-        } else {
-            return false;
-        }
-    },
-    
-    /* 
-     * returns true if the plugin is installed and AutoUpdate is enabled
-     */
-    isAutoUpdateEnabled: function() {
-        if (deployJava.isPluginInstalled()) {
-            return deployJava.getPlugin().isAutoUpdateEnabled();
-        }
-        return false;
-    },
-
-    /* 
-     * sets AutoUpdate on if plugin is installed
-     */
-    setAutoUpdateEnabled: function() { 
-        if (deployJava.isPluginInstalled()) { 
-            return deployJava.getPlugin().setAutoUpdateEnabled(); 
-        }
-        return false;
-    },
-
-    /*
-     * sets the preferred install type : null, online, kernel
-     */
-    setInstallerType: function(type) {
-        deployJava.installType = type;
-        if (deployJava.isPluginInstalled()) {
-            return deployJava.getPlugin().setInstallerType(type);
-        }
-        return false;
-    },
-
-    /*
-     * sets additional package list - to be used by kernel installer
-     */
-    setAdditionalPackages: function(packageList) {
-        if (deployJava.isPluginInstalled()) {
-            return deployJava.getPlugin().setAdditionalPackages(
-                                                     packageList);
-        }
-        return false;
-    },
-
-    /*
-     * sets preference to install Early Access versions if available
-     */
-    setEarlyAccess: function(enabled) {
-        deployJava.EAInstallEnabled = enabled;
-    },
-
-    /*
-     * Determines if the next generation plugin (Plugin II) is default
-     */
-    isPlugin2: function() {
-        if (deployJava.isPluginInstalled()) {
-            try {
-                return deployJava.getPlugin().isPlugin2();
-            } catch (err) {
-                // older plugin w/o isPlugin2() function - just fall through
-            }
-        }
-        return false;
-    },
-       
-
-    getPlugin: function() {
-        deployJava.refresh();
-        var ret = document.getElementById('deployJavaPlugin');
-        return ret;
-    },
-
-    compareVersionToPattern: function(version, patternArray, familyMatch) {
-        var regex = "^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+)(?:_(\\d+))?)?)?$";
-        var matchData = version.match(regex);  
-
-        if (matchData != null) { 
-            var index = 0;
-            var result = new Array();
-
-            for (var i = 1; i < matchData.length; ++i) {
-                if ((typeof matchData[i] == 'string') && (matchData[i] != ''))
-                {
-                    result[index] = matchData[i];
-                    index++;
-                }
-            }
-
-            var l = Math.min(result.length, patternArray.length);
-
-            if (familyMatch) {
-                for (var i = 0; i < l; ++i) {
-                    if (result[i] != patternArray[i]) return false;
-                }
-
-                return true;
-            } else {
-                for (var i = 0; i < l; ++i) {
-                    if (result[i] < patternArray[i]) {
-                        return false;
-                    } else if (result[i] > patternArray[i]) {
-                        return true;
-                    }
-                }
-                
-                return true;
-            }
-        } else {
-            return false;
-        }
-    },
-
-  
-    getBrowser: function() {
-        var browser = navigator.userAgent.toLowerCase();
-    
-        if (deployJava.debug) {
-            alert('userAgent -> ' + browser);
-        }
-    
-        if ((navigator.vendor) && 
-            (navigator.vendor.toLowerCase().indexOf('apple') != -1) &&
-            (browser.indexOf('safari') != -1)) {
-            if (deployJava.debug) {
-                alert('We claim to have detected "Safari".');
-            }
-            return 'Safari';
-        } else if (browser.indexOf('msie') != -1) {
-            if (deployJava.debug) {
-                alert('We claim to have detected "IE".');
-            }
-            return 'MSIE';
-        } else if ((browser.indexOf('mozilla') != -1) || 
-                   (browser.indexOf('firefox') != -1)) {
-            if (deployJava.debug) {
-                alert('We claim to have detected a Netscape family browser.');
-            }
-            return 'Netscape Family';
-        } else {
-            if (deployJava.debug) {
-                alert('We claim to have failed to detect a browser.');
-            }
-            return '?';
-        }
-    },
-    
-    
-    testUsingActiveX: function(version) {
-        var objectName = 'JavaWebStart.isInstalled.' + version + '.0';
-    
-        if (!ActiveXObject) {
-            if (deployJava.debug) {
-              alert ('Browser claims to be IE, but no ActiveXObject object?');
-            }
-            return false;
-        }
-    
-        try {
-            return (new ActiveXObject(objectName) != null);
-        } catch (exception) {
-            return false;
-        }
-    },
-    
-
-    testForMSVM: function() {
-        var clsid = '{08B0E5C0-4FCB-11CF-AAA5-00401C608500}';
-
-        if (typeof oClientCaps != 'undefined') {
-            var v = oClientCaps.getComponentVersion(clsid, "ComponentID");
-            if ((v == '') || (v == '5,0,5000,0')) {
-                return false;
-            } else {
-                return true;
-            } 
-        } else {
-            return false;
-        }
-    },
-
-    
-    testUsingMimeTypes: function(version) {
-        if (!navigator.mimeTypes) {
-            if (deployJava.debug) {
-                alert ('Browser claims to be Netscape family, but no mimeTypes[] array?');
-            }
-            return false;
-        }
-    
-        for (var i = 0; i < navigator.mimeTypes.length; ++i) {
-            s = navigator.mimeTypes[i].type;
-            var m = s.match(/^application\/x-java-applet\x3Bversion=(1\.8|1\.7|1\.6|1\.5|1\.4\.2)$/);
-            if (m != null) {
-                if (deployJava.compareVersions(m[1], version)) {
-                    return true;   
-                }
-            }
-        }
-        return false;
-    },
-    
-    
-    testUsingPluginsArray: function(version) {
-        if ((!navigator.plugins) || (!navigator.plugins.length)) {
-            if (deployJava.debug) {
-                alert ('Browser claims to be Safari, but no plugins[] array?');
-            }
-            return false;
-        }
-
-        for (var i = 0; i < navigator.plugins.length; ++i) {
-            s = navigator.plugins[i].description;
-    
-            if (s.search(/^Java Switchable Plug-in/) != -1) {
-                return true;
-            }
-    
-            m = s.match(/^Java (1\.4\.2|1\.5|1\.6|1\.7).* Plug-in/);
-            if (m != null) {
-                if (deployJava.compareVersions(m[1], version)) return true; 
-            }
-        }
-        return false;
-    },
-    
-    IEInstall: function() {
-    
-        location.href = deployJava.getJavaURL + 
-            ((deployJava.returnPage != null) ?
-            ('&returnPage=' + deployJava.returnPage) : '') +
-            ((deployJava.locale != null) ?
-            ('&locale=' + deployJava.locale) : '') +
-            ((deployJava.brand != null) ? ('&brand=' + deployJava.brand) : '') +
-            ((deployJava.installType != null) ? 
-             ('&type=' + deployJava.installType) : '');
-
-         // should not actually get here
-         return false;
-    },
-    
-    done: function (name, result) {
-    },
-    
-    FFInstall: function() {
-
-        location.href = deployJava.getJavaURL + 
-            ((deployJava.returnPage != null) ?
-            ('&returnPage=' + deployJava.returnPage) : '') +
-            ((deployJava.locale != null) ?
-            ('&locale=' + deployJava.locale) : '') +
-            ((deployJava.brand != null) ? ('&brand=' + deployJava.brand) : '') +
-            ((deployJava.installType != null) ? 
-                ('&type=' + deployJava.installType) : '');
-
-         // should not actually get here
-         return false;
-    },
-
-    // return true if 'installed' (considered as a JRE version string) is
-    // greater than or equal to 'required' (again, a JRE version string).
-    compareVersions: function(installed, required) {
-
-        var a = installed.split('.');
-        var b = required.split('.');
-    
-        for (var i = 0; i < a.length; ++i) {
-            a[i] = Number(a[i]);
-        }
-        for (var i = 0; i < b.length; ++i) {
-            b[i] = Number(b[i]);
-        }
-        if (a.length == 2) {
-            a[2] = 0;      
-        }
-    
-        if (a[0] > b[0]) return true;
-        if (a[0] < b[0]) return false;
-    
-        if (a[1] > b[1]) return true;
-        if (a[1] < b[1]) return false;
-    
-        if (a[2] > b[2]) return true;
-        if (a[2] < b[2]) return false;
-    
-        return true;
-    },
-    
-    
-    enableAlerts: function() {
-        deployJava.debug = true;
-    },
-
-    poll: function() {
-
-        deployJava.refresh();
-        var postInstallJREList = deployJava.getJREs();           
-
-        if ((deployJava.preInstallJREList.length == 0) && 
-            (postInstallJREList.length != 0)) {
-            clearInterval(deployJava.myInterval);
-            if (deployJava.returnPage != null) {
-                location.href = deployJava.returnPage;
-            };
-        }
-
-        if ((deployJava.preInstallJREList.length != 0) && 
-            (postInstallJREList.length != 0) &&
-            (deployJava.preInstallJREList[0] != postInstallJREList[0])) {
-            clearInterval(deployJava.myInterval);
-            if (deployJava.returnPage != null) {
-                location.href = deployJava.returnPage;
-            }
-        }
-
-    },
-    
-    writePluginTag: function() {
-        var browser = deployJava.getBrowser();
-        if (browser == 'MSIE') {
-            document.write('<' + 
-                'object classid="clsid:CAFEEFAC-DEC7-0000-0000-ABCDEFFEDCBA" ' +
-                'id="deployJavaPlugin" width="0" height="0">' +
-                '<' + '/' + 'object' + '>');
-        } else if (browser == 'Netscape Family') {
-            if (navigator.mimeTypes != null) for (var i=0; 
-                    i < navigator.mimeTypes.length; i++) {
-                if (navigator.mimeTypes[i].type == deployJava.mimeType) {
-                    if (navigator.mimeTypes[i].enabledPlugin) {
-                        document.write('<' + 
-                            'embed id="deployJavaPlugin" type="' + 
-                            deployJava.mimeType + '" hidden="true" />');
-                    }
-                }
-           }
-        }
-    },
-
-    refresh: function() {
-        navigator.plugins.refresh(false);
-
-        var browser = deployJava.getBrowser();
-        if (browser == 'Netscape Family') {
-            var plugin = document.getElementById('deployJavaPlugin');
-            // only do this again if no plugin
-            if (plugin == null) {
-                if (navigator.mimeTypes != null) for (var i=0;
-                    i < navigator.mimeTypes.length; i++) {
-                    if (navigator.mimeTypes[i].type == deployJava.mimeType) {
-                        if (navigator.mimeTypes[i].enabledPlugin) {
-                            document.write('<' +
-                                'embed id="deployJavaPlugin" type="' +
-                                deployJava.mimeType + '" hidden="true" />');
-                        }
-                    }
-               }
-            }
-        }
-    },
-
-    do_initialize: function() {
-        deployJava.writePluginTag();
-        if (deployJava.locale == null) {
-            var loc = null;
-
-            if (loc == null) try {
-                loc = navigator.userLanguage;
-            } catch (err) { }
-
-            if (loc == null) try {
-                loc = navigator.systemLanguage;
-            } catch (err) { }
-    
-            if (loc == null) try {
-                loc = navigator.language;
-            } catch (err) { }
-    
-            if (loc != null) {
-                loc.replace("-","_")
-                deployJava.locale = loc;
-            }
-        }
-    }
-      
-};
-deployJava.do_initialize();
-
-- 
cgit v1.2.3


From ecc31875b8eb4ffa5b44c4f4ef9b863daa22a682 Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Tue, 27 Jul 2010 09:37:22 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1175
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 id/server/auth/src/main/webapp/css/index.css           | 4 ++--
 id/server/auth/src/main/webapp/template_handyBKU.html  | 2 +-
 id/server/auth/src/main/webapp/template_onlineBKU.html | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/src/main/webapp/css/index.css b/id/server/auth/src/main/webapp/css/index.css
index 8abeb7a5f..3dea4d7ff 100644
--- a/id/server/auth/src/main/webapp/css/index.css
+++ b/id/server/auth/src/main/webapp/css/index.css
@@ -204,12 +204,12 @@ p {
 
 /* [OPTIONAL] Geben Sie hier die Farbe fuer den hellen Hintergrund an */
 .hell {
-	background-color : #FFBBCB;
+	background-color : #DDDDDD;	
 }
 
 /* [OPTIONAL] Geben Sie hier die Farbe fuer den dunklen Hintergrund an */
 .dunkel {
-	background-color: #993366;
+	background-color: #A02D2D;
 }
 
 /* [OPTIONAL] Geben Sie hier die Farbe fuer Links an */
diff --git a/id/server/auth/src/main/webapp/template_handyBKU.html b/id/server/auth/src/main/webapp/template_handyBKU.html
index a89377153..4ae6c2231 100644
--- a/id/server/auth/src/main/webapp/template_handyBKU.html
+++ b/id/server/auth/src/main/webapp/template_handyBKU.html
@@ -22,7 +22,7 @@
 			<input type="hidden" name="appletHeight" value="149">
 			
 			<!-- [OPTIONAL] Aendern Sie hier die Hintergrundfarbe der Handy-BKU -->
-			<input type="hidden" name="backgroundColor" value="#FFBBCB "> 
+			<input type="hidden" name="backgroundColor" value="#DDDDDD"> 
             
 			<input type="hidden" name="redirecttarget" value="_parent">
 		</form>
diff --git a/id/server/auth/src/main/webapp/template_onlineBKU.html b/id/server/auth/src/main/webapp/template_onlineBKU.html
index f4dda9830..28207e9e2 100644
--- a/id/server/auth/src/main/webapp/template_onlineBKU.html
+++ b/id/server/auth/src/main/webapp/template_onlineBKU.html
@@ -22,7 +22,7 @@
 			<input type="hidden" name="appletHeight" value="130">
 			
 			<!-- [OPTIONAL] Aendern Sie hier die Hintergrundfarbe der Online-BKU -->
-	      <input type="hidden" name="appletBackgroundColor" value="#FFBBCB">
+	      <input type="hidden" name="appletBackgroundColor" value="#DDDDDD">
 		</form>
 		
 		<form name="CustomizedInfoForm" action="<BKU>" method="post">
-- 
cgit v1.2.3


From 66a1e0545eca48d90b29b2c35c82be8dccb28bfa Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Tue, 27 Jul 2010 09:51:55 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1176
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 id/server/auth/src/main/webapp/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html
index 46ac4dd86..1cb5030a6 100644
--- a/id/server/auth/src/main/webapp/index.html
+++ b/id/server/auth/src/main/webapp/index.html
@@ -24,7 +24,7 @@
 		 		var iframe = document.createElement("iframe");
 		        iframe.setAttribute("src", "iframeOnlineBKU.html");
 		        iframe.setAttribute("width", "210");
-		        iframe.setAttribute("height", "150");
+		        iframe.setAttribute("height", "155");
 		        iframe.setAttribute("frameborder", "0");
 		        iframe.setAttribute("scrolling", "no");
 		        iframe.setAttribute("title", "Login");
-- 
cgit v1.2.3


From 7848a953758fe645da5abc16eb8abff1fdc11da8 Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Tue, 27 Jul 2010 20:15:31 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1177
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 id/server/auth/src/main/webapp/img/logo.jpg | Bin 18014 -> 18260 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/src/main/webapp/img/logo.jpg b/id/server/auth/src/main/webapp/img/logo.jpg
index 6bfc6a1e9..bafbccc84 100644
Binary files a/id/server/auth/src/main/webapp/img/logo.jpg and b/id/server/auth/src/main/webapp/img/logo.jpg differ
-- 
cgit v1.2.3


From 25e5ba1011151d2395facbee5f2afd22e3ea1929 Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 28 Jul 2010 07:01:59 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1178
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 .../src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf   | Bin 0 -> 190907 bytes
 .../src/main/webapp/BKAuswahl-Musterseiten-Howto.pdf   | Bin 178626 -> 0 bytes
 id/server/auth/src/main/webapp/index.html              |   8 ++++----
 3 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf
 delete mode 100644 id/server/auth/src/main/webapp/BKAuswahl-Musterseiten-Howto.pdf

(limited to 'id/server/auth')

diff --git a/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf b/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf
new file mode 100644
index 000000000..021e15b94
Binary files /dev/null and b/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf differ
diff --git a/id/server/auth/src/main/webapp/BKAuswahl-Musterseiten-Howto.pdf b/id/server/auth/src/main/webapp/BKAuswahl-Musterseiten-Howto.pdf
deleted file mode 100644
index 1c0662f15..000000000
Binary files a/id/server/auth/src/main/webapp/BKAuswahl-Musterseiten-Howto.pdf and /dev/null differ
diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html
index 1cb5030a6..a49d8c6bc 100644
--- a/id/server/auth/src/main/webapp/index.html
+++ b/id/server/auth/src/main/webapp/index.html
@@ -3,7 +3,7 @@
     <head>
         <!-- [OPTIONAL] Aendern Sie hier den Titel der Seite -->
         <title>
-            Musterseite
+           MOA-Template zur B&uuml;rgerkartenauswahl (Musterseite)
         </title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
         <meta http-equiv="Content-Style-Type" content="text/css">
@@ -59,7 +59,7 @@
 			<div id="banner">
                 <!-- [OPTIONAL] Aendern Sie hier die Titelueberschrift der Seite) -->
                 <div id="bannerleft">
-                    <h1>Musterseite</h1>
+                    <h1>MOA-Template zur B&uuml;rgerkartenauswahl (Musterseite)</h1>
                     <!-- Meldung im Browser, wenn JavaScript nicht aktiviert -->
                     <noscript>
                         <p>
@@ -140,12 +140,12 @@
                 <div id="centercontent">
 
                     <h2 id="contentheader" class="dunkel">
-                        Hinweise zur der Musterseite                   
+                        Hinweise zum MOA-Template
                     </h2>
 
                     <div id="content" class="hell">
                         <p>
-                        	Eine Anleitung zur Nutzung der Musterseite finden Sie hier: <a href="BKAuswahl-Musterseiten-Howto.pdf" target="_blank">BKAuswahl-Musterseiten-Howto (PDF, 170kB)</a>.
+                        	Eine Anleitung zur Nutzung des MOA-Template finden Sie hier: <a href="BKAuswahl-MOA-Template-Howto.pdf" target="_blank">BKAuswahl-MOA-Template-Howto.pdf (PDF, 190B)</a>.
                         So m&uuml;ssen vor einem Login noch die Parameter für den MOA-ID Aufruf angegeben werden.</p>                        	
                         <p>
                         	Diese Musterseite erf&uuml;llt die Richtlinie f&uuml;r barrierefreie Webinhalte 2.0 (WCAG 2.0 des W3C) Stufe AA. Das Pr&uuml;fprotokoll hierzu finden Sie hier: <a href="WCAG-Pruefprotokoll.pdf" target="_blank">Pruefprotokoll.pdf (PDF, 705kB)</a>.
-- 
cgit v1.2.3


From 63994a018a74808e6124e45e32a970c9a24410ee Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Thu, 26 Aug 2010 13:49:48 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1186
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 id/server/auth/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index ed9e68aa7..7904ca02d 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>1.4.7</version>
+		<version>1.4.8</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-auth</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.7</version>
+	<version>1.4.8</version>
 	<name>MOA ID-Auth WebService</name>
 	
 	<properties>
-- 
cgit v1.2.3


From ff023754e7ac46af874d00458840f50976fb7b38 Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 16 Mar 2011 12:20:24 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1195
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 id/server/auth/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 7904ca02d..67d2e1abd 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>1.4.8</version>
+		<version>1.5.0</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-auth</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.8</version>
+	<version>1.5.0</version>
 	<name>MOA ID-Auth WebService</name>
 	
 	<properties>
-- 
cgit v1.2.3


From ab7c7b6a64edca60b78a89b18a1972ad5e38586e Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Fri, 1 Apr 2011 08:03:14 +0000
Subject: =?UTF-8?q?-=20Update=20Parameter=C3=BCberpr=C3=BCfung=20-=20Updat?=
 =?UTF-8?q?e=20MOA-Template=20zur=20B=C3=BCrgerkartenauswahl=20-=20=C3=84n?=
 =?UTF-8?q?derung=20der=20Konfiguration=20f=C3=BCr:=20=09-=20Angabe=20eine?=
 =?UTF-8?q?r=20Liste=20von=20vertrauensw=C3=BCrdigen=20BKUs=20(aufgrund=20?=
 =?UTF-8?q?Parameterpr=C3=BCfung)=20-=20Fixed=20Bug=20#552=20(http://egovl?=
 =?UTF-8?q?abs.gv.at/tracker/index.php=3Ffunc=3Ddetail&aid=3D552&group=5Fi?=
 =?UTF-8?q?d=3D6&atid=3D105)=20-=20Fixed=20Bug=20#551=20(http://egovlabs.g?=
 =?UTF-8?q?v.at/tracker/index.php=3Ffunc=3Ddetail&aid=3D551&group=5Fid=3D6?=
 =?UTF-8?q?&atid=3D105)=20-=20Fixed=20Bug=20#550=20(http://egovlabs.gv.at/?=
 =?UTF-8?q?tracker/index.php=3Ffunc=3Ddetail&aid=3D550&group=5Fid=3D6&atid?=
 =?UTF-8?q?=3D105)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1198 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 .../main/webapp/BKAuswahl-MOA-Template-Howto.pdf   | Bin 190907 -> 175414 bytes
 id/server/auth/src/main/webapp/css/index.css       |  32 +++++++--
 id/server/auth/src/main/webapp/iframeHandyBKU.html |  41 ++++++++---
 .../auth/src/main/webapp/iframeOnlineBKU.html      |  48 ++++++++++---
 id/server/auth/src/main/webapp/index.html          |  78 ++++++++++++++++++---
 .../auth/src/main/webapp/template_handyBKU.html    |   4 +-
 .../auth/src/main/webapp/template_onlineBKU.html   |   4 +-
 7 files changed, 168 insertions(+), 39 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf b/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf
index 021e15b94..b68d247cb 100644
Binary files a/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf and b/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf differ
diff --git a/id/server/auth/src/main/webapp/css/index.css b/id/server/auth/src/main/webapp/css/index.css
index 3dea4d7ff..39b715a6e 100644
--- a/id/server/auth/src/main/webapp/css/index.css
+++ b/id/server/auth/src/main/webapp/css/index.css
@@ -82,7 +82,7 @@ p#skiplinks  a:active {
 
 #leftcontent {
 	float:left;
-	width:210px;		
+	width:220px;		
 }
 
 h2#tabheader, h2#contentheader {
@@ -94,7 +94,7 @@ h2#tabheader, h2#contentheader {
 
 #bkulogin {
 	overflow:hidden;	
-	width:210px;
+	width:220px;
 }
 
 #bkukarte {
@@ -113,6 +113,12 @@ h2#tabheader, h2#contentheader {
 	width:40%;
 }
 
+#mandate{
+	text-align:center;
+	padding : 5px 5px 5px 5px;
+}
+
+
 button {
 	background: #efefef;
 	border:1px solid #000;
@@ -161,19 +167,19 @@ button {
 }
 
 iframe {
-	width:210px;
+	width:220px;
 }
 
 /* right */
 
 #rightcontent {
 	float:right;
-	width:210px;
+	width:220px;
 }
 
 #centercontent {
 	width:auto;
-	margin: 0 220px;
+	margin: 0 230px;
 }
 
 /* center */
@@ -202,6 +208,22 @@ p {
 }
 
 
+#mandateLogin {
+	vertical-align: middle;
+}
+
+.infobutton {
+	background-color: #005a00;
+	color: white;
+	font-family: serif;
+	text-decoration: none;
+	padding-top: 2px;
+	padding-right: 4px;
+	padding-bottom: 2px;
+	padding-left: 4px;
+	font-weight: bold;
+}
+
 /* [OPTIONAL] Geben Sie hier die Farbe fuer den hellen Hintergrund an */
 .hell {
 	background-color : #DDDDDD;	
diff --git a/id/server/auth/src/main/webapp/iframeHandyBKU.html b/id/server/auth/src/main/webapp/iframeHandyBKU.html
index 24a2d80f9..06639c7e5 100644
--- a/id/server/auth/src/main/webapp/iframeHandyBKU.html
+++ b/id/server/auth/src/main/webapp/iframeHandyBKU.html
@@ -7,22 +7,47 @@
     	<meta http-equiv="PRAGMA" content="NO-CACHE">
     	<script type="text/javascript">
 			window.onload=function() {
+				var Template = get_url_param("Template", "startAuth");
+				var startAuth = get_url_param("startAuth", "useMandate");
+				var useMandate = get_url_param("useMandate", "");
+			
+				document.moaidform.useMandate.value = useMandate;
+				document.moaidform.action = startAuth;
+				document.moaidform.Template.value = Template;
+				
       			document.moaidform.submit();
       			return;
       		}
+			
+			function get_url_param(name, follower) {
+
+				var url = window.location.href;
+				var i = url.indexOf(name);
+				url = url.substring(i + name.length+1, url.length);				
+				if (follower.length != 0) {
+					i = url.indexOf(follower);
+					url = url.substring(0, i-1);
+				}
+			
+				
+				// alert (name + ": " + url);
+				
+				return url;
+				
+			}
 		</script>
 	</head>
 	<body>
 		Bitte warten...
+
+		<form method="POST" name="moaidform">
+			<input type="hidden" name="Template">
+            <input type="hidden" name="bkuURI" value="https://www.a-trust.at/mobile/https-security-layer-request/default.aspx">		
+            <input type="hidden" name="useMandate">
+    	</form>		
 		
-		<!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an -->
-		<!-- z.B.: action="https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at" -->
-		<FORM  name="moaidform" action="[MOA_ID_STARTAUTHENTICATION]" method="post">
-    	<!-- [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Handy BKU an -->
-			<!-- z.B.: value="https://yoururl.at/moa-id-auth/template_handyBKU.html"-->
-			<input type="hidden" name="Template" value="[URL_TO_HANDYBKU_TEMPLATE]">
-			<input type="hidden" name="bkuURI" value="https://www.a-trust.at/mobile/https-security-layer-request/default.aspx">
-		</FORM>
+        
+        
 		
 		<hr>
 	</body>
diff --git a/id/server/auth/src/main/webapp/iframeOnlineBKU.html b/id/server/auth/src/main/webapp/iframeOnlineBKU.html
index e92420e7a..b0f6b8bb0 100644
--- a/id/server/auth/src/main/webapp/iframeOnlineBKU.html
+++ b/id/server/auth/src/main/webapp/iframeOnlineBKU.html
@@ -7,23 +7,49 @@
     	<meta http-equiv="PRAGMA" content="NO-CACHE">
 	    <script type="text/javascript">
 			window.onload=function() {
-    		  	document.moaidform.submit();
+				
+				var bkuURI = get_url_param("bkuURI", "Template");
+				var Template = get_url_param("Template", "startAuth");
+				var startAuth = get_url_param("startAuth", "useMandate");
+				var useMandate = get_url_param("useMandate", "");
+			
+				document.moaidform.useMandate.value = useMandate;
+				document.moaidform.action = startAuth;
+				document.moaidform.Template.value = Template;
+				document.moaidform.bkuURI.value = bkuURI;
+
+				document.moaidform.submit();
+				
       			return;
       		}
+
+			function get_url_param(name, follower) {
+
+				var url = window.location.href;
+				var i = url.indexOf(name);
+				url = url.substring(i + name.length+1, url.length);				
+				if (follower.length != 0) {
+					i = url.indexOf(follower);
+					url = url.substring(0, i-1);
+				}
+			
+				
+				// alert (name + ": " + url);
+				
+				return url;
+				
+			}
+			
+
 		</script>
 	</head>
 	<body>
 		Bitte warten...
-		
-        <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an -->
-		<!-- z.B.: action="https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at" -->
-		<form method="POST" name="moaidform" id="moa" action="[MOA_ID_STARTAUTHENTICATION]">
-			<!-- [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Online BKU an -->
-			<!-- z.B.: value="https://yoururl.at/moa-id-auth/template_onlineBKU.html"-->
-			<input type="hidden" name="Template" value="[URL_TO_ONLINEBKU_TEMPLATE]">
-            <!-- [MUSS] Geben Sie hier die URL zur Online BKU an -->
-			<!-- z.B.: value="https://yoururl.at/bkuonline/https-security-layer-request"-->
-            <input type="hidden" name="bkuURI" value="[URL_TO_ONLINEBKU]">
+        
+		<form method="POST" name="moaidform">
+			<input type="hidden" name="Template">
+            <input type="hidden" name="bkuURI">		
+            <input type="hidden" name="useMandate">
     	</form>
 	
 		<hr>
diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html
index a49d8c6bc..0e12035e9 100644
--- a/id/server/auth/src/main/webapp/index.html
+++ b/id/server/auth/src/main/webapp/index.html
@@ -9,22 +9,64 @@
         <meta http-equiv="Content-Style-Type" content="text/css">
         <link rel="stylesheet" type="text/css" href="css/index.css">
         <script type="text/javascript">
+			
+			// [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an
+            // z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at
+			var MOA_ID_STARTAUTHENTICATION = "[MOA_ID_STARTAUTHENTICATION]";
+			
+			// [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die lokale BKU an
+            // z.B.: https://yoururl.at/moa-id-auth/template_localBKU.html
+			var URL_TO_LOKALBKU_TEMPLATE = "[URL_TO_LOKALBKU_TEMPLATE]";
+			
+			// [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Online BKU an
+			// z.B.: "https://yoururl.at/moa-id-auth/template_onlineBKU.html"
+			var URL_TO_ONLINEBKU_TEMPLATE = "[URL_TO_ONLINEBKU_TEMPLATE]";
+			
+			// [MUSS] Geben Sie hier die URL zur Online BKU an
+			// z.B.: value="https://yoururl.at/bkuonline/https-security-layer-request"
+			var URL_TO_ONLINEBKU = "[URL_TO_ONLINEBKU]";
+			
+			// [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Handy Signatur an -->
+			<!-- z.B.: value="https://yoururl.at/moa-id-auth/template_handyBKU.html"-->
+			var URL_TO_HANDYSIGNATUR_TEMPLATE = "[URL_TO_HANDYSIGNATUR_TEMPLATE]";
+			
+			
 			window.onload=function() {
 				document.getElementById("localBKU").style.display="none";
+				
 				return;
         	}
+			
 
 	        function bkuOnlineClicked() {
 				<!-- [OPTIONAL] Um die lokale BKU auszublenden, ersetzen Sie in der folgenden Zeile "block" durch "none" -->
 				document.getElementById("localBKU").style.display="block"; 
+				
+				// set values for local BKU
+				document.getElementById("form_local_bku").action = MOA_ID_STARTAUTHENTICATION;
+				document.getElementById("input_localBKU_template").value = URL_TO_LOKALBKU_TEMPLATE;
+				if (document.getElementById("mandateCheckBox").checked) {
+					document.getElementById("useMandate").value = "true";
+				}
+				else {
+					document.getElementById("useMandate").value = "false";
+				}
 
+				// set values for online BKU
 		        var el = document.getElementById("bkulogin");
         		var parent = el.parentNode;
 				
+				var checkBox = document.getElementById("mandateCheckBox");				
+				var iFrameURL = "iframeOnlineBKU.html" + "?";
+				iFrameURL += "bkuURI=" + URL_TO_ONLINEBKU + "&";
+				iFrameURL += "Template=" + URL_TO_ONLINEBKU_TEMPLATE + "&";
+				iFrameURL += "startAuth=" + MOA_ID_STARTAUTHENTICATION + "&";
+				iFrameURL += "useMandate=" + checkBox.checked ;
+			
 		 		var iframe = document.createElement("iframe");
-		        iframe.setAttribute("src", "iframeOnlineBKU.html");
-		        iframe.setAttribute("width", "210");
-		        iframe.setAttribute("height", "155");
+		        iframe.setAttribute("src", iFrameURL);
+		        iframe.setAttribute("width", "220");  
+		        iframe.setAttribute("height", "165");
 		        iframe.setAttribute("frameborder", "0");
 		        iframe.setAttribute("scrolling", "no");
 		        iframe.setAttribute("title", "Login");
@@ -36,13 +78,21 @@
         	function bkuHandyClicked() {
 	        	document.getElementById("localBKU").style.display="none";
     	    	
+				// set values for Handy Signatur
 		        var el = document.getElementById("bkulogin");
 	    	    var parent = el.parentNode;
+
+				var checkBox = document.getElementById("mandateCheckBox");				
+				var iFrameURL = "iframeHandyBKU.html" + "?";
+				iFrameURL += "Template=" + URL_TO_HANDYSIGNATUR_TEMPLATE + "&";
+				iFrameURL += "startAuth=" + MOA_ID_STARTAUTHENTICATION + "&";
+				iFrameURL += "useMandate=" + checkBox.checked ;
+
 		         
 	        	var iframe = document.createElement("iframe");
-		        iframe.setAttribute("src", "iframeHandyBKU.html");
-	    	    iframe.setAttribute("width", "210");
-	        	iframe.setAttribute("height", "149");
+		        iframe.setAttribute("src", iFrameURL);
+	    	    iframe.setAttribute("width", "220"); 
+	        	iframe.setAttribute("height", "159");
 		        iframe.setAttribute("frameborder", "0");
 	        	iframe.setAttribute("scrolling", "no");
 	    	    iframe.setAttribute("title", "Login");
@@ -86,19 +136,25 @@
                         <div id="bkuhandy" class="hell">
                             <button name="bkuButton" type="button" onClick="bkuHandyClicked();">HANDY</button>
                         </div> 
+                        <div id="mandate">
+                    		<input type="checkbox" name="Mandate" style="vertical-align: middle; margin-right: 5px;" id="mandateCheckBox"><label>in Vertretung anmelden</label>
+                        </div>
                     </div>
+                    
+					
+
+
 
                     <div id="localBKU" style="display:none" class="hell">
                         <hr>
-                        <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an -->
-                        <!-- z.B.: action="https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at"-->
-                        <form method="post" action="[MOA_ID_STARTAUTHENTICATION]">
+                        <form id="form_local_bku" method="post">
                             <input type="hidden" name="show" value="false"> 
 							<!-- [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die lokale BKU an -->
                             <!-- z.B.: value="https://yoururl.at/moa-id-auth/template_localBKU.html"-->
-                            <input type="hidden" name="Template" value="[URL_TO_LOKALBKU_TEMPLATE]">
+                            <input type="hidden" name="Template" id="input_localBKU_template" >
                             <input type="hidden" name="bkuURI" value="https://localhost:3496/https-security-layer-request"> 
-                            <input type="submit" size="400" value="Lokale BKU">
+                            <input type="hidden" name="useMandate" id="useMandate">
+                            <input type="submit" size="400" value="Lokale BKU">                            
                         </form>
                         <p>
                             <small>Alternativ k&ouml;nnen Sie eine lokal installierte BKU verwenden.</small>                        
diff --git a/id/server/auth/src/main/webapp/template_handyBKU.html b/id/server/auth/src/main/webapp/template_handyBKU.html
index 4ae6c2231..6ccd295b2 100644
--- a/id/server/auth/src/main/webapp/template_handyBKU.html
+++ b/id/server/auth/src/main/webapp/template_handyBKU.html
@@ -18,8 +18,8 @@
 			<input type="hidden" name="PushInfobox" value="<PushInfobox>">
 			
 			<!-- Angabe der Parameter für die Handy-BKU -->
-			<input type="hidden" name="appletWidth" value="210">
-			<input type="hidden" name="appletHeight" value="149">
+			<input type="hidden" name="appletWidth" value="220">
+			<input type="hidden" name="appletHeight" value="159">
 			
 			<!-- [OPTIONAL] Aendern Sie hier die Hintergrundfarbe der Handy-BKU -->
 			<input type="hidden" name="backgroundColor" value="#DDDDDD"> 
diff --git a/id/server/auth/src/main/webapp/template_onlineBKU.html b/id/server/auth/src/main/webapp/template_onlineBKU.html
index 28207e9e2..1bb2ac236 100644
--- a/id/server/auth/src/main/webapp/template_onlineBKU.html
+++ b/id/server/auth/src/main/webapp/template_onlineBKU.html
@@ -18,8 +18,8 @@
 			<input type="hidden" name="PushInfobox" value="<PushInfobox>">
 		
 			<!-- Angabe der Parameter fuer die Online-BKU -->
-			<input type="hidden" name="appletWidth" value="210">
-			<input type="hidden" name="appletHeight" value="130">
+			<input type="hidden" name="appletWidth" value="220">
+			<input type="hidden" name="appletHeight" value="140">
 			
 			<!-- [OPTIONAL] Aendern Sie hier die Hintergrundfarbe der Online-BKU -->
 	      <input type="hidden" name="appletBackgroundColor" value="#DDDDDD">
-- 
cgit v1.2.3


From ac9a6c52e96f4c737de3392a7ba16b8fa8958b85 Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 6 Apr 2011 15:29:11 +0000
Subject: =?UTF-8?q?-=20IAIK=20Libraries=20(repository)=20aktualisiert:=20?=
 =?UTF-8?q?=09iaik-moa:=20=20=20=20=20=20=20=20=20=20=20Version=201.29=20?=
 =?UTF-8?q?=09iaik=5Fjce=5Ffull:=09=09Version=204.0=5FMOA=20=09iaik=5Fcms:?=
 =?UTF-8?q?=09=09=09Version=204.1=5FMOA=20-=20Einbindung=20von=20Online-Vo?=
 =?UTF-8?q?llmachten=20-=20Update=20MOA-Template=20zur=20B=C3=BCrgerkarten?=
 =?UTF-8?q?auswahl=20-=20Update=20Doku=20-=20Update=20Transformationen=20(?=
 =?UTF-8?q?f=C3=BCr=20Online-Vollmachten)=20-=20=C3=84nderung=20der=20Konf?=
 =?UTF-8?q?iguration=20f=C3=BCr:=20=09-=20Online-Vollmachten?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1199 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 .../main/webapp/BKAuswahl-MOA-Template-Howto.pdf   | Bin 175414 -> 175412 bytes
 id/server/auth/src/main/webapp/WEB-INF/web.xml     |  14 ++++-
 id/server/auth/src/main/webapp/css/index.css       |  14 +----
 id/server/auth/src/main/webapp/iframeHandyBKU.html |   5 +-
 id/server/auth/src/main/webapp/index.html          |  57 +++++++++++++--------
 5 files changed, 50 insertions(+), 40 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf b/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf
index b68d247cb..bb0e11a80 100644
Binary files a/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf and b/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf differ
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 e1261b819..ef75dff24 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -28,6 +28,13 @@
 		<description>Verify the certificate coming from security layer</description>
 		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.VerifyCertificateServlet</servlet-class>
 	</servlet>
+	<servlet>
+		<servlet-name>GetMISSessionID</servlet-name>
+		<display-name>GetMISSessionID</display-name>
+		<description>Get the MIS session ID coming from security layer</description>
+		<servlet-class>at.gv.egovernment.moa.id.auth.servlet.GetMISSessionIDServlet</servlet-class>
+	</servlet>
+	
 	<servlet>
 		<servlet-name>GetForeignID</servlet-name>
 		<display-name>GetForeignID</display-name>
@@ -88,11 +95,14 @@
 		<servlet-name>VerifyIdentityLink</servlet-name>
 		<url-pattern>/VerifyIdentityLink</url-pattern>
 	</servlet-mapping>
-		<servlet-mapping>
+	<servlet-mapping>
 		<servlet-name>VerifyCertificate</servlet-name>
 		<url-pattern>/VerifyCertificate</url-pattern>
 	</servlet-mapping>
-	
+	<servlet-mapping>
+		<servlet-name>GetMISSessionID</servlet-name>
+		<url-pattern>/GetMISSessionID</url-pattern>
+	</servlet-mapping>
 	<servlet-mapping>
 		<servlet-name>GetForeignID</servlet-name>
 		<url-pattern>/GetForeignID</url-pattern>
diff --git a/id/server/auth/src/main/webapp/css/index.css b/id/server/auth/src/main/webapp/css/index.css
index 39b715a6e..28fea78e3 100644
--- a/id/server/auth/src/main/webapp/css/index.css
+++ b/id/server/auth/src/main/webapp/css/index.css
@@ -94,7 +94,7 @@ h2#tabheader, h2#contentheader {
 
 #bkulogin {
 	overflow:hidden;	
-	width:220px;
+	width:220px;	
 }
 
 #bkukarte {
@@ -212,18 +212,6 @@ p {
 	vertical-align: middle;
 }
 
-.infobutton {
-	background-color: #005a00;
-	color: white;
-	font-family: serif;
-	text-decoration: none;
-	padding-top: 2px;
-	padding-right: 4px;
-	padding-bottom: 2px;
-	padding-left: 4px;
-	font-weight: bold;
-}
-
 /* [OPTIONAL] Geben Sie hier die Farbe fuer den hellen Hintergrund an */
 .hell {
 	background-color : #DDDDDD;	
diff --git a/id/server/auth/src/main/webapp/iframeHandyBKU.html b/id/server/auth/src/main/webapp/iframeHandyBKU.html
index 06639c7e5..4661eea70 100644
--- a/id/server/auth/src/main/webapp/iframeHandyBKU.html
+++ b/id/server/auth/src/main/webapp/iframeHandyBKU.html
@@ -28,9 +28,6 @@
 					i = url.indexOf(follower);
 					url = url.substring(0, i-1);
 				}
-			
-				
-				// alert (name + ": " + url);
 				
 				return url;
 				
@@ -42,7 +39,7 @@
 
 		<form method="POST" name="moaidform">
 			<input type="hidden" name="Template">
-            <input type="hidden" name="bkuURI" value="https://www.a-trust.at/mobile/https-security-layer-request/default.aspx">		
+            <input type="hidden" name="bkuURI" value="https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx">		
             <input type="hidden" name="useMandate">
     	</form>		
 		
diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html
index 0e12035e9..51bcc7156 100644
--- a/id/server/auth/src/main/webapp/index.html
+++ b/id/server/auth/src/main/webapp/index.html
@@ -12,25 +12,30 @@
 			
 			// [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an
             // z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at
-			var MOA_ID_STARTAUTHENTICATION = "[MOA_ID_STARTAUTHENTICATION]";
+			// var MOA_ID_STARTAUTHENTICATION = "[MOA_ID_STARTAUTHENTICATION]";
+			var MOA_ID_STARTAUTHENTICATION = "https://localhost:8443/moa-id-auth/StartAuthentication?Target=sss&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample";
 			
 			// [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die lokale BKU an
             // z.B.: https://yoururl.at/moa-id-auth/template_localBKU.html
-			var URL_TO_LOKALBKU_TEMPLATE = "[URL_TO_LOKALBKU_TEMPLATE]";
+			//var URL_TO_LOKALBKU_TEMPLATE = "[URL_TO_LOKALBKU_TEMPLATE]";
+			var URL_TO_LOKALBKU_TEMPLATE = "https://localhost:8443/moa-id-auth/template_localBKU.html";
 			
 			// [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Online BKU an
 			// z.B.: "https://yoururl.at/moa-id-auth/template_onlineBKU.html"
-			var URL_TO_ONLINEBKU_TEMPLATE = "[URL_TO_ONLINEBKU_TEMPLATE]";
+			//var URL_TO_ONLINEBKU_TEMPLATE = "[URL_TO_ONLINEBKU_TEMPLATE]";
+			var URL_TO_ONLINEBKU_TEMPLATE = "https://localhost:8443/moa-id-auth/template_onlineBKU.html";
 			
 			// [MUSS] Geben Sie hier die URL zur Online BKU an
 			// z.B.: value="https://yoururl.at/bkuonline/https-security-layer-request"
-			var URL_TO_ONLINEBKU = "[URL_TO_ONLINEBKU]";
-			
+			//var URL_TO_ONLINEBKU = "[URL_TO_ONLINEBKU]";
+			//var URL_TO_ONLINEBKU = "http://localhost:8082/bkuonline/http-security-layer-request";
+			var URL_TO_ONLINEBKU = "https://localhost:8444/bkuonline/https-security-layer-request";
+
 			// [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Handy Signatur an -->
 			<!-- z.B.: value="https://yoururl.at/moa-id-auth/template_handyBKU.html"-->
-			var URL_TO_HANDYSIGNATUR_TEMPLATE = "[URL_TO_HANDYSIGNATUR_TEMPLATE]";
-			
-			
+			//var URL_TO_HANDYSIGNATUR_TEMPLATE = "[URL_TO_HANDYSIGNATUR_TEMPLATE]";
+			var URL_TO_HANDYSIGNATUR_TEMPLATE = "https://localhost:8443/moa-id-auth/template_handyBKU.html";
+		
 			window.onload=function() {
 				document.getElementById("localBKU").style.display="none";
 				
@@ -45,23 +50,23 @@
 				// set values for local BKU
 				document.getElementById("form_local_bku").action = MOA_ID_STARTAUTHENTICATION;
 				document.getElementById("input_localBKU_template").value = URL_TO_LOKALBKU_TEMPLATE;
-				if (document.getElementById("mandateCheckBox").checked) {
-					document.getElementById("useMandate").value = "true";
-				}
-				else {
-					document.getElementById("useMandate").value = "false";
+				document.getElementById("useMandate").value = "false";
+				var checkbox = document.getElementById("mandateCheckBox")
+				if (checkbox !=  null) {
+					if (document.getElementById("mandateCheckBox").checked) {
+						document.getElementById("useMandate").value = "true";
+					}
 				}
-
+				
 				// set values for online BKU
 		        var el = document.getElementById("bkulogin");
         		var parent = el.parentNode;
 				
-				var checkBox = document.getElementById("mandateCheckBox");				
 				var iFrameURL = "iframeOnlineBKU.html" + "?";
 				iFrameURL += "bkuURI=" + URL_TO_ONLINEBKU + "&";
 				iFrameURL += "Template=" + URL_TO_ONLINEBKU_TEMPLATE + "&";
 				iFrameURL += "startAuth=" + MOA_ID_STARTAUTHENTICATION + "&";
-				iFrameURL += "useMandate=" + checkBox.checked ;
+				iFrameURL += "useMandate=" + document.getElementById("useMandate").value;
 			
 		 		var iframe = document.createElement("iframe");
 		        iframe.setAttribute("src", iFrameURL);
@@ -78,17 +83,24 @@
         	function bkuHandyClicked() {
 	        	document.getElementById("localBKU").style.display="none";
     	    	
+				document.getElementById("useMandate").value = "false";
+				var checkbox = document.getElementById("mandateCheckBox")
+				if (checkbox !=  null) {
+					if (document.getElementById("mandateCheckBox").checked) {
+						document.getElementById("useMandate").value = "true";
+					}
+				}
+				
 				// set values for Handy Signatur
 		        var el = document.getElementById("bkulogin");
 	    	    var parent = el.parentNode;
 
-				var checkBox = document.getElementById("mandateCheckBox");				
+				
 				var iFrameURL = "iframeHandyBKU.html" + "?";
 				iFrameURL += "Template=" + URL_TO_HANDYSIGNATUR_TEMPLATE + "&";
 				iFrameURL += "startAuth=" + MOA_ID_STARTAUTHENTICATION + "&";
-				iFrameURL += "useMandate=" + checkBox.checked ;
+				iFrameURL += "useMandate=" + document.getElementById("useMandate").value;
 
-		         
 	        	var iframe = document.createElement("iframe");
 		        iframe.setAttribute("src", iFrameURL);
 	    	    iframe.setAttribute("width", "220"); 
@@ -136,9 +148,12 @@
                         <div id="bkuhandy" class="hell">
                             <button name="bkuButton" type="button" onClick="bkuHandyClicked();">HANDY</button>
                         </div> 
-                        <div id="mandate">
-                    		<input type="checkbox" name="Mandate" style="vertical-align: middle; margin-right: 5px;" id="mandateCheckBox"><label>in Vertretung anmelden</label>
+                        
+                        <!-- [OPTIONAL] Um die Anmeldung mit Vollmachten auszublenden, kommentieren Sie das folgende div (mandate) aus -->
+						<div id="mandate">
+	                   		<input type="checkbox" name="Mandate" style="vertical-align: middle; margin-right: 5px;" id="mandateCheckBox"><label>in Vertretung anmelden</label>
                         </div>
+
                     </div>
                     
 					
-- 
cgit v1.2.3


From e2cdcaf1adc00a92ca4d21febd0a9be9e3aaf34c Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 6 Apr 2011 19:44:10 +0000
Subject: Update MOA Template

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1200 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 .../main/webapp/BKAuswahl-MOA-Template-Howto.pdf   | Bin 175412 -> 191806 bytes
 id/server/auth/src/main/webapp/iframeHandyBKU.html |  68 ++++++++++--------
 .../auth/src/main/webapp/iframeOnlineBKU.html      |  70 +++++++++---------
 id/server/auth/src/main/webapp/index.html          |  80 +++++++--------------
 4 files changed, 102 insertions(+), 116 deletions(-)

(limited to 'id/server/auth')

diff --git a/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf b/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf
index bb0e11a80..dcf38c218 100644
Binary files a/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf and b/id/server/auth/src/main/webapp/BKAuswahl-MOA-Template-Howto.pdf differ
diff --git a/id/server/auth/src/main/webapp/iframeHandyBKU.html b/id/server/auth/src/main/webapp/iframeHandyBKU.html
index 4661eea70..f07b73265 100644
--- a/id/server/auth/src/main/webapp/iframeHandyBKU.html
+++ b/id/server/auth/src/main/webapp/iframeHandyBKU.html
@@ -6,45 +6,55 @@
     	<meta http-equiv="CACHE-CONTROL" content="NO-CACHE">
     	<meta http-equiv="PRAGMA" content="NO-CACHE">
     	<script type="text/javascript">
+			// [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an
+           	// z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at
+			var MOA_ID_STARTAUTHENTICATION = "[MOA_ID_STARTAUTHENTICATION]";
+				
+			// [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Handy Signatur an -->
+			<!-- z.B.: value="https://yoururl.at/moa-id-auth/template_handyBKU.html"-->
+			var URL_TO_HANDYSIGNATUR_TEMPLATE = "[URL_TO_HANDYSIGNATUR_TEMPLATE]";
+				
+				
 			window.onload=function() {
-				var Template = get_url_param("Template", "startAuth");
-				var startAuth = get_url_param("startAuth", "useMandate");
-				var useMandate = get_url_param("useMandate", "");
-			
-				document.moaidform.useMandate.value = useMandate;
-				document.moaidform.action = startAuth;
-				document.moaidform.Template.value = Template;
+								
+				document.getElementById('moaidform').action = MOA_ID_STARTAUTHENTICATION;
+				document.getElementById('Template').value = URL_TO_HANDYSIGNATUR_TEMPLATE;
+
+				var useMandate = gup("useMandate");
+
+				if (useMandate == "true")
+					document.getElementById('useMandate').value = "true";
+				else
+					document.getElementById('useMandate').value = "false";
+
 				
       			document.moaidform.submit();
       			return;
       		}
-			
-			function get_url_param(name, follower) {
-
-				var url = window.location.href;
-				var i = url.indexOf(name);
-				url = url.substring(i + name.length+1, url.length);				
-				if (follower.length != 0) {
-					i = url.indexOf(follower);
-					url = url.substring(0, i-1);
-				}
-				
-				return url;
-				
+      		
+			function gup(name) {
+				name = name.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]");
+			  	var regexS = "[\\?&]"+name+"=([^&#]*)";
+			  	var regex = new RegExp( regexS );
+			  	var results = regex.exec( window.location.href );
+			  	if( results == null )
+			    	return "";
+			  	else
+			    	return results[1];
 			}
+			
 		</script>
 	</head>
 	<body>
-		Bitte warten...
+    
+    Bitte warten...
+
+		<FORM name="moaidform" method="post" id="moaidform">
+			<input type="hidden" name="Template" id="Template">
+			<input type="hidden" name="bkuURI" value="https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx">
+			<input type="hidden" name="useMandate" id="useMandate">
+		</FORM>
 
-		<form method="POST" name="moaidform">
-			<input type="hidden" name="Template">
-            <input type="hidden" name="bkuURI" value="https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx">		
-            <input type="hidden" name="useMandate">
-    	</form>		
-		
-        
-        
 		
 		<hr>
 	</body>
diff --git a/id/server/auth/src/main/webapp/iframeOnlineBKU.html b/id/server/auth/src/main/webapp/iframeOnlineBKU.html
index b0f6b8bb0..4873245be 100644
--- a/id/server/auth/src/main/webapp/iframeOnlineBKU.html
+++ b/id/server/auth/src/main/webapp/iframeOnlineBKU.html
@@ -6,50 +6,54 @@
 	    <meta http-equiv="CACHE-CONTROL" content="NO-CACHE">
     	<meta http-equiv="PRAGMA" content="NO-CACHE">
 	    <script type="text/javascript">
-			window.onload=function() {
-				
-				var bkuURI = get_url_param("bkuURI", "Template");
-				var Template = get_url_param("Template", "startAuth");
-				var startAuth = get_url_param("startAuth", "useMandate");
-				var useMandate = get_url_param("useMandate", "");
+			// [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an
+            // z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at
+			var MOA_ID_STARTAUTHENTICATION = "[MOA_ID_STARTAUTHENTICATION]";
 			
-				document.moaidform.useMandate.value = useMandate;
-				document.moaidform.action = startAuth;
-				document.moaidform.Template.value = Template;
-				document.moaidform.bkuURI.value = bkuURI;
+			// [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Online BKU an
+			// z.B.: "https://yoururl.at/moa-id-auth/template_onlineBKU.html"
+			var URL_TO_ONLINEBKU_TEMPLATE = "[URL_TO_ONLINEBKU_TEMPLATE]";
+			
+			// [MUSS] Geben Sie hier die URL zur Online BKU an
+			// z.B.: value="https://yoururl.at/bkuonline/https-security-layer-request"
+			// Hinweis: Diese URL muss auch bei den vertrauenswürdigen BKUs in der MOA-ID Konfiguration angegeben werden (siehe Element MOA-IDConfiguration/TrustedBKUs/BKUURL)
+			var URL_TO_ONLINEBKU = "[URL_TO_ONLINEBKU]";
+				
+			window.onload=function() {
+				document.getElementById('moaidform').action = MOA_ID_STARTAUTHENTICATION;
+				document.getElementById('Template').value = URL_TO_ONLINEBKU_TEMPLATE;
+				document.getElementById('bkuURI').value = URL_TO_ONLINEBKU;
 
-				document.moaidform.submit();
+				var useMandate = gup("useMandate");
+
+				if (useMandate == "true")
+					document.getElementById('useMandate').value = "true";
+				else
+					document.getElementById('useMandate').value = "false";
 				
+				document.moaidform.submit();
       			return;
       		}
 
-			function get_url_param(name, follower) {
-
-				var url = window.location.href;
-				var i = url.indexOf(name);
-				url = url.substring(i + name.length+1, url.length);				
-				if (follower.length != 0) {
-					i = url.indexOf(follower);
-					url = url.substring(0, i-1);
-				}
-			
-				
-				// alert (name + ": " + url);
-				
-				return url;
-				
+			function gup(name) {
+				name = name.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]");
+			  	var regexS = "[\\?&]"+name+"=([^&#]*)";
+			  	var regex = new RegExp( regexS );
+			  	var results = regex.exec( window.location.href );
+			  	if( results == null )
+			    	return "";
+			  	else
+			    	return results[1];
 			}
-			
-
 		</script>
 	</head>
 	<body>
 		Bitte warten...
-        
-		<form method="POST" name="moaidform">
-			<input type="hidden" name="Template">
-            <input type="hidden" name="bkuURI">		
-            <input type="hidden" name="useMandate">
+		
+		<form method="POST" name="moaidform" id="moaidform">
+			<input type="hidden" name="Template" id="Template">
+            <input type="hidden" name="bkuURI" id="bkuURI">
+            <input type="hidden" name="useMandate" id="useMandate">
     	</form>
 	
 		<hr>
diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html
index 51bcc7156..62576b15e 100644
--- a/id/server/auth/src/main/webapp/index.html
+++ b/id/server/auth/src/main/webapp/index.html
@@ -9,47 +9,28 @@
         <meta http-equiv="Content-Style-Type" content="text/css">
         <link rel="stylesheet" type="text/css" href="css/index.css">
         <script type="text/javascript">
-			
 			// [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an
             // z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at
-			// var MOA_ID_STARTAUTHENTICATION = "[MOA_ID_STARTAUTHENTICATION]";
-			var MOA_ID_STARTAUTHENTICATION = "https://localhost:8443/moa-id-auth/StartAuthentication?Target=sss&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample";
+			var MOA_ID_STARTAUTHENTICATION = "[MOA_ID_STARTAUTHENTICATION]";
 			
 			// [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die lokale BKU an
             // z.B.: https://yoururl.at/moa-id-auth/template_localBKU.html
-			//var URL_TO_LOKALBKU_TEMPLATE = "[URL_TO_LOKALBKU_TEMPLATE]";
-			var URL_TO_LOKALBKU_TEMPLATE = "https://localhost:8443/moa-id-auth/template_localBKU.html";
+			var URL_TO_LOKALBKU_TEMPLATE = "[URL_TO_LOKALBKU_TEMPLATE]";
 			
-			// [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Online BKU an
-			// z.B.: "https://yoururl.at/moa-id-auth/template_onlineBKU.html"
-			//var URL_TO_ONLINEBKU_TEMPLATE = "[URL_TO_ONLINEBKU_TEMPLATE]";
-			var URL_TO_ONLINEBKU_TEMPLATE = "https://localhost:8443/moa-id-auth/template_onlineBKU.html";
 			
-			// [MUSS] Geben Sie hier die URL zur Online BKU an
-			// z.B.: value="https://yoururl.at/bkuonline/https-security-layer-request"
-			//var URL_TO_ONLINEBKU = "[URL_TO_ONLINEBKU]";
-			//var URL_TO_ONLINEBKU = "http://localhost:8082/bkuonline/http-security-layer-request";
-			var URL_TO_ONLINEBKU = "https://localhost:8444/bkuonline/https-security-layer-request";
-
-			// [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Handy Signatur an -->
-			<!-- z.B.: value="https://yoururl.at/moa-id-auth/template_handyBKU.html"-->
-			//var URL_TO_HANDYSIGNATUR_TEMPLATE = "[URL_TO_HANDYSIGNATUR_TEMPLATE]";
-			var URL_TO_HANDYSIGNATUR_TEMPLATE = "https://localhost:8443/moa-id-auth/template_handyBKU.html";
-		
 			window.onload=function() {
-				document.getElementById("localBKU").style.display="none";
 				
+				document.getElementById("localBKU").style.display="none";
 				return;
         	}
-			
 
 	        function bkuOnlineClicked() {
 				<!-- [OPTIONAL] Um die lokale BKU auszublenden, ersetzen Sie in der folgenden Zeile "block" durch "none" -->
 				document.getElementById("localBKU").style.display="block"; 
 				
-				// set values for local BKU
-				document.getElementById("form_local_bku").action = MOA_ID_STARTAUTHENTICATION;
-				document.getElementById("input_localBKU_template").value = URL_TO_LOKALBKU_TEMPLATE;
+				document.getElementById("moaidform").action = MOA_ID_STARTAUTHENTICATION;
+				document.getElementById("Template").value = URL_TO_LOKALBKU_TEMPLATE;
+				
 				document.getElementById("useMandate").value = "false";
 				var checkbox = document.getElementById("mandateCheckBox")
 				if (checkbox !=  null) {
@@ -57,20 +38,16 @@
 						document.getElementById("useMandate").value = "true";
 					}
 				}
-				
-				// set values for online BKU
+					
 		        var el = document.getElementById("bkulogin");
         		var parent = el.parentNode;
-				
+
 				var iFrameURL = "iframeOnlineBKU.html" + "?";
-				iFrameURL += "bkuURI=" + URL_TO_ONLINEBKU + "&";
-				iFrameURL += "Template=" + URL_TO_ONLINEBKU_TEMPLATE + "&";
-				iFrameURL += "startAuth=" + MOA_ID_STARTAUTHENTICATION + "&";
 				iFrameURL += "useMandate=" + document.getElementById("useMandate").value;
-			
-		 		var iframe = document.createElement("iframe");
+
+				var iframe = document.createElement("iframe");
 		        iframe.setAttribute("src", iFrameURL);
-		        iframe.setAttribute("width", "220");  
+		        iframe.setAttribute("width", "220");
 		        iframe.setAttribute("height", "165");
 		        iframe.setAttribute("frameborder", "0");
 		        iframe.setAttribute("scrolling", "no");
@@ -82,8 +59,8 @@
 
         	function bkuHandyClicked() {
 	        	document.getElementById("localBKU").style.display="none";
-    	    	
-				document.getElementById("useMandate").value = "false";
+
+	        	document.getElementById("useMandate").value = "false";
 				var checkbox = document.getElementById("mandateCheckBox")
 				if (checkbox !=  null) {
 					if (document.getElementById("mandateCheckBox").checked) {
@@ -91,19 +68,15 @@
 					}
 				}
 				
-				// set values for Handy Signatur
-		        var el = document.getElementById("bkulogin");
+	            var el = document.getElementById("bkulogin");
 	    	    var parent = el.parentNode;
 
-				
 				var iFrameURL = "iframeHandyBKU.html" + "?";
-				iFrameURL += "Template=" + URL_TO_HANDYSIGNATUR_TEMPLATE + "&";
-				iFrameURL += "startAuth=" + MOA_ID_STARTAUTHENTICATION + "&";
 				iFrameURL += "useMandate=" + document.getElementById("useMandate").value;
 
-	        	var iframe = document.createElement("iframe");
+	    	    var iframe = document.createElement("iframe");
 		        iframe.setAttribute("src", iFrameURL);
-	    	    iframe.setAttribute("width", "220"); 
+	    	    iframe.setAttribute("width", "220");
 	        	iframe.setAttribute("height", "159");
 		        iframe.setAttribute("frameborder", "0");
 	        	iframe.setAttribute("scrolling", "no");
@@ -147,29 +120,28 @@
 						<!-- [OPTIONAL] Um die Mobile BKU auszublenden, kommentieren sie das folgende div (bkukhandy) aus -->
                         <div id="bkuhandy" class="hell">
                             <button name="bkuButton" type="button" onClick="bkuHandyClicked();">HANDY</button>
-                        </div> 
+                        </div>
                         
                         <!-- [OPTIONAL] Um die Anmeldung mit Vollmachten auszublenden, kommentieren Sie das folgende div (mandate) aus -->
 						<div id="mandate">
 	                   		<input type="checkbox" name="Mandate" style="vertical-align: middle; margin-right: 5px;" id="mandateCheckBox"><label>in Vertretung anmelden</label>
-                        </div>
-
+                        </div> 
                     </div>
                     
-					
-
-
+                    
 
                     <div id="localBKU" style="display:none" class="hell">
                         <hr>
-                        <form id="form_local_bku" method="post">
+                        <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an -->
+                        <!-- z.B.: action="https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at"-->
+                        <form method="post" id="moaidform">
                             <input type="hidden" name="show" value="false"> 
 							<!-- [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die lokale BKU an -->
                             <!-- z.B.: value="https://yoururl.at/moa-id-auth/template_localBKU.html"-->
-                            <input type="hidden" name="Template" id="input_localBKU_template" >
-                            <input type="hidden" name="bkuURI" value="https://localhost:3496/https-security-layer-request"> 
-                            <input type="hidden" name="useMandate" id="useMandate">
-                            <input type="submit" size="400" value="Lokale BKU">                            
+                            <input type="hidden" name="Template" id="Template">
+                            <input type="hidden" name="bkuURI" value="https://localhost:3496/https-security-layer-request">
+                            <input type="hidden" name="useMandate" id="useMandate"> 
+                            <input type="submit" size="400" value="Lokale BKU">
                         </form>
                         <p>
                             <small>Alternativ k&ouml;nnen Sie eine lokal installierte BKU verwenden.</small>                        
-- 
cgit v1.2.3