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
---
 .../resources/data/deploy/tomcat/server.mod_jk.xml | 166 +++++++++++++++++
 .../resources/data/deploy/tomcat/server.xml        | 169 +++++++++++++++++
 .../resources/data/deploy/tomcat/unix/moa-env.sh   |  12 ++
 .../data/deploy/tomcat/uriworkermap.properties     |   4 +
 .../data/deploy/tomcat/win32/startTomcat.bat       |  27 +++
 .../data/deploy/tomcat/win32/stopTomcat.bat        |  13 ++
 .../data/deploy/tomcat/workers.properties          |   6 +
 .../resources/data/deploy/tools/certtool.bat       |  25 +++
 .../resources/data/deploy/tools/certtool.sh        |  20 ++
 .../resources/data/deploy/tools/configtool.bat     |  25 +++
 .../resources/data/deploy/tools/configtool.sh      |  20 ++
 .../serverlib/resources/licenses/Apache-2.0.txt    | 202 +++++++++++++++++++++
 .../serverlib/resources/licenses/IAIK-License.txt  |  13 ++
 spss/server/serverlib/resources/licenses/Jaxen.txt |  40 ++++
 .../resources/licenses/PostgreSQL-JDBC.txt         |  26 +++
 15 files changed, 768 insertions(+)
 create mode 100644 spss/server/serverlib/resources/data/deploy/tomcat/server.mod_jk.xml
 create mode 100644 spss/server/serverlib/resources/data/deploy/tomcat/server.xml
 create mode 100644 spss/server/serverlib/resources/data/deploy/tomcat/unix/moa-env.sh
 create mode 100644 spss/server/serverlib/resources/data/deploy/tomcat/uriworkermap.properties
 create mode 100644 spss/server/serverlib/resources/data/deploy/tomcat/win32/startTomcat.bat
 create mode 100644 spss/server/serverlib/resources/data/deploy/tomcat/win32/stopTomcat.bat
 create mode 100644 spss/server/serverlib/resources/data/deploy/tomcat/workers.properties
 create mode 100644 spss/server/serverlib/resources/data/deploy/tools/certtool.bat
 create mode 100644 spss/server/serverlib/resources/data/deploy/tools/certtool.sh
 create mode 100644 spss/server/serverlib/resources/data/deploy/tools/configtool.bat
 create mode 100644 spss/server/serverlib/resources/data/deploy/tools/configtool.sh
 create mode 100644 spss/server/serverlib/resources/licenses/Apache-2.0.txt
 create mode 100644 spss/server/serverlib/resources/licenses/IAIK-License.txt
 create mode 100644 spss/server/serverlib/resources/licenses/Jaxen.txt
 create mode 100644 spss/server/serverlib/resources/licenses/PostgreSQL-JDBC.txt

(limited to 'spss/server/serverlib/resources')

diff --git a/spss/server/serverlib/resources/data/deploy/tomcat/server.mod_jk.xml b/spss/server/serverlib/resources/data/deploy/tomcat/server.mod_jk.xml
new file mode 100644
index 000000000..e6035b8be
--- /dev/null
+++ b/spss/server/serverlib/resources/data/deploy/tomcat/server.mod_jk.xml
@@ -0,0 +1,166 @@
+<!-- Alternate Example-less Configuration File -->
+<!-- Note that component elements are nested corresponding to their
+     parent-child relationships with each other -->
+
+<!-- A "Server" is a singleton element that represents the entire JVM,
+     which may contain one or more "Service" instances.  The Server
+     listens for a shutdown command on the indicated port.
+
+     Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" or "Loggers" at this level.
+ -->
+
+<Server port="8005" shutdown="SHUTDOWN" debug="0">
+
+
+  <!-- Uncomment this entry to enable JMX MBeans support -->
+<!--
+  <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"
+                debug="0" port="-1" login="admin" password="admin"/>
+-->
+
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" (and therefore the web applications visible
+       within that Container).  Normally, that Container is an "Engine",
+       but this is not required.
+
+       Note:  A "Service" is not itself a "Container", so you may not
+       define subcomponents such as "Valves" or "Loggers" at this level.
+   -->
+
+  <!-- Define the Tomcat Stand-Alone Service -->
+  <Service name="Tomcat-Standalone">
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned.  Each Connector passes requests on to the
+         associated "Container" (normally an Engine) for processing.
+
+         By default, a non-SSL HTTP/1.1 Connector is established on port 8080.
+         You can also enable an SSL HTTP/1.1 Connector on port 8443 by
+         following the instructions below and uncommenting the second Connector
+         entry.  SSL support requires the following steps (see the SSL Config
+         HOWTO in the Tomcat 4.0 documentation bundle for more detailed
+         instructions):
+         * Download and install JSSE 1.0.2 or later, and put the JAR files
+           into "$JAVA_HOME/jre/lib/ext".
+         * Execute:
+             %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
+             $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA  (Unix)
+           with a password value of "changeit" for both the certificate and
+           the keystore itself.
+
+         By default, DNS lookups are enabled when a web application calls
+         request.getRemoteHost().  This can have an adverse impact on
+         performance, so you can disable it by setting the
+         "enableLookups" attribute to "false".  When DNS lookups are disabled,
+         request.getRemoteHost() will return the String version of the
+         IP address of the remote client.
+    -->
+
+    <!-- Define a Coyote/JK2 AJP 1.3 Connector on port 8009 -->
+    <!--
+    <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
+               port="8009" minProcessors="5" maxProcessors="75"
+               enableLookups="true" redirectPort="8443"
+               acceptCount="10" debug="0" connectionTimeout="0"
+               useURIValidationHack="false"
+               protocolHandlerClassName="org.apache.jk.server.JkCoyoteHandler"/>
+    -->
+    
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <Connector className="org.apache.ajp.tomcat4.Ajp13Connector"
+               port="8009" minProcessors="5" maxProcessors="75"
+               acceptCount="10" debug="0"/>
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host). -->
+
+    <!-- Define the top level container in our container hierarchy -->
+    <Engine name="Standalone" defaultHost="localhost" debug="0">
+
+      <!-- The request dumper valve dumps useful debugging information about
+           the request headers and cookies that were received, and the response
+           headers and cookies that were sent, for all requests received by
+           this instance of Tomcat.  If you care only about requests to a
+           particular virtual host, or a particular application, nest this
+           element inside the corresponding <Host> or <Context> entry instead.
+
+           For a similar mechanism that is portable to all Servlet 2.3
+           containers, check out the "RequestDumperFilter" Filter in the
+           example application (the source for this filter may be found in
+           "$CATALINA_HOME/webapps/examples/WEB-INF/classes/filters").
+
+           Request dumping is disabled by default.  Uncomment the following
+           element to enable it. -->
+      <!--
+      <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
+      -->
+
+      <!-- Global logger unless overridden at lower levels -->
+      <Logger className="org.apache.catalina.logger.FileLogger"
+              prefix="catalina_log." suffix=".txt"
+              timestamp="true"/>
+
+      <!-- Because this Realm is here, an instance will be shared globally -->
+
+      <Realm className="org.apache.catalina.realm.MemoryRealm" />
+
+      <!-- Replace the above Realm with one of the following to get a Realm
+           stored in a database and accessed via JDBC -->
+
+      <!-- Define the default virtual host -->
+      <Host name="localhost" debug="0" appBase="webapps" 
+       unpackWARs="true" autoDeploy="true">
+
+        <!-- Normally, users must authenticate themselves to each web app
+             individually.  Uncomment the following entry if you would like
+             a user to be authenticated the first time they encounter a
+             resource protected by a security constraint, and then have that
+             user identity maintained across *all* web applications contained
+             in this virtual host. -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn"
+                   debug="0"/>
+        -->
+
+        <!-- Access log processes all requests for this virtual host.  By
+             default, log files are created in the "logs" directory relative to
+             $CATALINA_HOME.  If you wish, you can specify a different
+             directory with the "directory" attribute.  Specify either a relative
+             (to $CATALINA_HOME) or absolute path to the desired directory.
+        -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve"
+                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
+                 pattern="common"/>
+
+        <!-- Logger shared by all Contexts related to this virtual host.  By
+             default (when using FileLogger), log files are created in the "logs"
+             directory relative to $CATALINA_HOME.  If you wish, you can specify
+             a different directory with the "directory" attribute.  Specify either a
+             relative (to $CATALINA_HOME) or absolute path to the desired
+             directory.-->
+        <Logger className="org.apache.catalina.logger.FileLogger"
+                 directory="logs"  prefix="localhost_log." suffix=".txt"
+	        timestamp="true"/>
+
+        <!-- Define properties for each web application.  This is only needed
+             if you want to set non-default properties, or have web application
+             document roots in places other than the virtual host's appBase
+             directory.  -->
+
+        <!-- Tomcat Root Context -->
+        <!--
+          <Context path="" docBase="ROOT" debug="0"/>
+        -->
+
+      </Host>
+
+    </Engine>
+
+  </Service>
+
+</Server>
+
diff --git a/spss/server/serverlib/resources/data/deploy/tomcat/server.xml b/spss/server/serverlib/resources/data/deploy/tomcat/server.xml
new file mode 100644
index 000000000..3e5966ca9
--- /dev/null
+++ b/spss/server/serverlib/resources/data/deploy/tomcat/server.xml
@@ -0,0 +1,169 @@
+<!-- Alternate Example-less Configuration File -->
+<!-- Note that component elements are nested corresponding to their
+     parent-child relationships with each other -->
+
+<!-- A "Server" is a singleton element that represents the entire JVM,
+     which may contain one or more "Service" instances.  The Server
+     listens for a shutdown command on the indicated port.
+
+     Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" or "Loggers" at this level.
+ -->
+
+<Server port="8005" shutdown="SHUTDOWN" debug="0">
+
+
+  <!-- Uncomment this entry to enable JMX MBeans support -->
+<!--
+  <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"
+                debug="0" port="-1" login="admin" password="admin"/>
+-->
+
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" (and therefore the web applications visible
+       within that Container).  Normally, that Container is an "Engine",
+       but this is not required.
+
+       Note:  A "Service" is not itself a "Container", so you may not
+       define subcomponents such as "Valves" or "Loggers" at this level.
+   -->
+
+  <!-- Define the Tomcat Stand-Alone Service -->
+  <Service name="Tomcat-Standalone">
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned.  Each Connector passes requests on to the
+         associated "Container" (normally an Engine) for processing.
+
+         By default, a non-SSL HTTP/1.1 Connector is established on port 8080.
+         You can also enable an SSL HTTP/1.1 Connector on port 8443 by
+         following the instructions below and uncommenting the second Connector
+         entry.  SSL support requires the following steps (see the SSL Config
+         HOWTO in the Tomcat 4.0 documentation bundle for more detailed
+         instructions):
+         * Download and install JSSE 1.0.2 or later, and put the JAR files
+           into "$JAVA_HOME/jre/lib/ext".
+         * Execute:
+             %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
+             $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA  (Unix)
+           with a password value of "changeit" for both the certificate and
+           the keystore itself.
+
+         By default, DNS lookups are enabled when a web application calls
+         request.getRemoteHost().  This can have an adverse impact on
+         performance, so you can disable it by setting the
+         "enableLookups" attribute to "false".  When DNS lookups are disabled,
+         request.getRemoteHost() will return the String version of the
+         IP address of the remote client.
+    -->
+
+    <!-- Define a non-SSL Coyote HTTP/1.1 Connector on port 8080 -->
+    <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
+               port="8080" minProcessors="5" maxProcessors="75"
+               enableLookups="true" redirectPort="8443"
+               acceptCount="100" debug="0" connectionTimeout="20000"
+               useURIValidationHack="false" disableUploadTimeout="true" />
+    <!-- Note : To disable connection timeouts, set connectionTimeout value 
+     to -1 -->
+
+    <!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 -->
+    <!--
+    <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
+               port="8443" minProcessors="5" maxProcessors="75"
+               enableLookups="uri"
+	       acceptCount="100" debug="0" scheme="https" secure="true"
+               useURIValidationHack="false" disableUploadTimeout="true">
+      <Factory className="org.apache.coyote.tomcat4.CoyoteServerSocketFactory"
+               clientAuth="false" protocol="TLS"/>
+    </Connector>
+    -->
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host). -->
+
+    <!-- Define the top level container in our container hierarchy -->
+    <Engine name="Standalone" defaultHost="localhost" debug="0">
+
+      <!-- The request dumper valve dumps useful debugging information about
+           the request headers and cookies that were received, and the response
+           headers and cookies that were sent, for all requests received by
+           this instance of Tomcat.  If you care only about requests to a
+           particular virtual host, or a particular application, nest this
+           element inside the corresponding <Host> or <Context> entry instead.
+
+           For a similar mechanism that is portable to all Servlet 2.3
+           containers, check out the "RequestDumperFilter" Filter in the
+           example application (the source for this filter may be found in
+           "$CATALINA_HOME/webapps/examples/WEB-INF/classes/filters").
+
+           Request dumping is disabled by default.  Uncomment the following
+           element to enable it. -->
+      <!--
+      <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
+      -->
+
+      <!-- Global logger unless overridden at lower levels -->
+      <Logger className="org.apache.catalina.logger.FileLogger"
+              prefix="catalina_log." suffix=".txt"
+              timestamp="true"/>
+
+      <!-- Because this Realm is here, an instance will be shared globally -->
+
+      <Realm className="org.apache.catalina.realm.MemoryRealm" />
+
+      <!-- Define the default virtual host -->
+      <Host name="localhost" debug="0" appBase="webapps" 
+       unpackWARs="true" autoDeploy="true">
+
+        <!-- Normally, users must authenticate themselves to each web app
+             individually.  Uncomment the following entry if you would like
+             a user to be authenticated the first time they encounter a
+             resource protected by a security constraint, and then have that
+             user identity maintained across *all* web applications contained
+             in this virtual host. -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn"
+                   debug="0"/>
+        -->
+
+        <!-- Access log processes all requests for this virtual host.  By
+             default, log files are created in the "logs" directory relative to
+             $CATALINA_HOME.  If you wish, you can specify a different
+             directory with the "directory" attribute.  Specify either a relative
+             (to $CATALINA_HOME) or absolute path to the desired directory.
+        -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve"
+                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
+                 pattern="common"/>
+
+        <!-- Logger shared by all Contexts related to this virtual host.  By
+             default (when using FileLogger), log files are created in the "logs"
+             directory relative to $CATALINA_HOME.  If you wish, you can specify
+             a different directory with the "directory" attribute.  Specify either a
+             relative (to $CATALINA_HOME) or absolute path to the desired
+             directory.-->
+        <Logger className="org.apache.catalina.logger.FileLogger"
+                 directory="logs"  prefix="localhost_log." suffix=".txt"
+	        timestamp="true"/>
+
+        <!-- Define properties for each web application.  This is only needed
+             if you want to set non-default properties, or have web application
+             document roots in places other than the virtual host's appBase
+             directory.  -->
+
+        <!-- Tomcat Root Context -->
+        <!--
+          <Context path="" docBase="ROOT" debug="0"/>
+        -->
+
+      </Host>
+
+    </Engine>
+
+  </Service>
+
+</Server>
+
diff --git a/spss/server/serverlib/resources/data/deploy/tomcat/unix/moa-env.sh b/spss/server/serverlib/resources/data/deploy/tomcat/unix/moa-env.sh
new file mode 100644
index 000000000..49d6723a3
--- /dev/null
+++ b/spss/server/serverlib/resources/data/deploy/tomcat/unix/moa-env.sh
@@ -0,0 +1,12 @@
+MOA_START=`pwd`
+
+CONFIG_OPT=-Dmoa.spss.server.configuration=$MOA_START/conf/moa-spss/spss.config.xml
+LOGGING_OPT=-Dlog4j.configuration=file:$MOA_START/conf/moa-spss/log4j.properties
+# NODE_ID_OPT=-Dmoa.node-id=node1
+# TRUST_STORE_OPT=-Djavax.net.ssl.trustStore=truststore.jks
+# TRUST_STORE_PASS_OPT=-Djavax.net.ssl.trustStorePassword=changeit
+# TRUST_STORE_TYPE_OPT=-Djavax.net.ssl.trustStoreType=jks
+
+export CATALINA_OPTS="$CONFIG_OPT $LOGGING_OPT $NODE_ID_OPT $TRUST_STORE_OPT $TRUST_STORE_PASS_OPT $TRUST_STORE_TYPE_OPT"
+
+echo CATALINA_OPTS=$CATALINA_OPTS
diff --git a/spss/server/serverlib/resources/data/deploy/tomcat/uriworkermap.properties b/spss/server/serverlib/resources/data/deploy/tomcat/uriworkermap.properties
new file mode 100644
index 000000000..673acf65d
--- /dev/null
+++ b/spss/server/serverlib/resources/data/deploy/tomcat/uriworkermap.properties
@@ -0,0 +1,4 @@
+# a sample mod_jk uriworkermap.properties file for mapping 
+# MOA SP/SS web service requests to workers
+
+/moa-spss/*=moaworker
\ No newline at end of file
diff --git a/spss/server/serverlib/resources/data/deploy/tomcat/win32/startTomcat.bat b/spss/server/serverlib/resources/data/deploy/tomcat/win32/startTomcat.bat
new file mode 100644
index 000000000..b7d740d12
--- /dev/null
+++ b/spss/server/serverlib/resources/data/deploy/tomcat/win32/startTomcat.bat
@@ -0,0 +1,27 @@
+rem ----------------------------------------------------------------------------------------------
+rem Modify these entries according to your needs
+
+rem JDK home directory (no trailing path separator)
+set JAVA_HOME=<jdk home directory>
+
+rem Tomcat 4.1.x home directory (no trailing path separator)
+set CATALINA_HOME=<Tomcat 4.1.x home directory>
+
+rem ----------------------------------------------------------------------------------------------
+
+set MOA_SPSS_CFG_HOME=%CATALINA_HOME%\conf\moa-spss
+
+set PARAM_SPSSCONFIG=-Dmoa.spss.server.configuration=%MOA_SPSS_CFG_HOME%\spss.config.xml
+set PARAM_LOGGING=-Dlog4j.configuration=file:%MOA_SPSS_CFG_HOME%\log4j.properties
+set PARAM_NODEID=-Dmoa.node-id=Node1
+set PARAMS_MOA=%PARAM_SPSSCONFIG% %PARAM_LOGGING% %PARAM_NODEID% 
+
+rem set PARAM_TRUST_STORE=-Djavax.net.ssl.trustStore=truststore.jks
+rem set PARAM_TRUST_STORE_PASS=-Djavax.net.ssl.trustStorePassword=changeit
+rem set PARAM_TRUST_STORE_TYPE=-Djavax.net.ssl.trustStoreType=jks
+rem set PARAMS_SSL=%PARAM_TRUST_STORE% %PARAM_TRUST_STORE_PASS% %PARAM_TRUST_STORE_TYPE%
+
+set CATALINA_OPTS=%PARAMS_MOA% %PARAMS_SSL% 
+
+cd %CATALINA_HOME%
+bin\catalina.bat start
\ No newline at end of file
diff --git a/spss/server/serverlib/resources/data/deploy/tomcat/win32/stopTomcat.bat b/spss/server/serverlib/resources/data/deploy/tomcat/win32/stopTomcat.bat
new file mode 100644
index 000000000..09dd83f2d
--- /dev/null
+++ b/spss/server/serverlib/resources/data/deploy/tomcat/win32/stopTomcat.bat
@@ -0,0 +1,13 @@
+rem ----------------------------------------------------------------------------------------------
+rem Modify these entries according to your needs
+
+rem JDK home directory (no trailing path separator)
+set JAVA_HOME=<jdk home directory>
+
+rem Tomcat 4.1.x home directory (no trailing path separator)
+set CATALINA_HOME=<Tomcat 4.1.x home directory>
+
+rem ----------------------------------------------------------------------------------------------
+
+cd %CATALINA_HOME%
+bin\catalina.bat stop
\ No newline at end of file
diff --git a/spss/server/serverlib/resources/data/deploy/tomcat/workers.properties b/spss/server/serverlib/resources/data/deploy/tomcat/workers.properties
new file mode 100644
index 000000000..9350ddc77
--- /dev/null
+++ b/spss/server/serverlib/resources/data/deploy/tomcat/workers.properties
@@ -0,0 +1,6 @@
+# a sample workers.properties file defining a single mod_jk worker
+
+worker.list=moaworker
+worker.moaworker.type=ajp13
+worker.moaworker.host=localhost
+worker.moaworker.port=8009
diff --git a/spss/server/serverlib/resources/data/deploy/tools/certtool.bat b/spss/server/serverlib/resources/data/deploy/tools/certtool.bat
new file mode 100644
index 000000000..0504211b8
--- /dev/null
+++ b/spss/server/serverlib/resources/data/deploy/tools/certtool.bat
@@ -0,0 +1,25 @@
+@echo off
+
+rem
+rem Script to invoke the CertTool class
+rem 
+rem Author: Patrick Peck
+rem Version: $Id: certtool.bat,v 1.6 2003/05/08 11:46:29 peck Exp $
+rem
+
+
+if %OS%=="Windows_NT" @setlocal
+
+set CERTTOOL=at.gv.egovernment.moa.spss.server.tools.CertTool
+set TOOLSPATH=%~p0
+set CLASSPATH=%TOOLSPATH%tools.jar;%TOOLSPATH%iaik_moa_full.jar;%TOOLSPATH%iaik_jce_full.jar;%TOOLSPATH%iaik_ecc.jar;%TOOLSPATH%log4j-1.2.7.jar
+
+if "%JAVA_HOME%"=="" goto noJavaHome
+%JAVA_HOME%\bin\java.exe -classpath %CLASSPATH% %CERTTOOL% %1 %2 %3 %4 %5 %6 %7 %8 %9
+goto end
+
+:noJavaHome
+echo error: JAVA_HOME not defined
+
+:end
+if %OS%=="Windows_NT" @endlocal
\ No newline at end of file
diff --git a/spss/server/serverlib/resources/data/deploy/tools/certtool.sh b/spss/server/serverlib/resources/data/deploy/tools/certtool.sh
new file mode 100644
index 000000000..c7ff374f4
--- /dev/null
+++ b/spss/server/serverlib/resources/data/deploy/tools/certtool.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+#
+# Script to invoke the CertTool class	
+#
+# Author:Patrick Peck
+# Version: $Id: certtool.sh,v 1.9 2003/06/23 16:01:27 peck Exp $
+#
+
+
+if [ -z "$JAVA_HOME" ]; then 
+  echo "error: JAVA_HOME not defined";
+  exit;
+fi
+
+CERTOOL=at.gv.egovernment.moa.spss.server.tools.CertTool
+TOOLSPATH=`dirname $PWD/$0`
+CLASSPATH=$TOOLSPATH/tools.jar:$TOOLSPATH/iaik_moa_full.jar:$TOOLSPATH/iaik_jce_full.jar:$TOOLSPATH/iaik_ecc.jar:$TOOLSPATH/log4j-1.2.7.jar
+
+$JAVA_HOME/bin/java -classpath $CLASSPATH $CERTOOL $*
diff --git a/spss/server/serverlib/resources/data/deploy/tools/configtool.bat b/spss/server/serverlib/resources/data/deploy/tools/configtool.bat
new file mode 100644
index 000000000..868df11f0
--- /dev/null
+++ b/spss/server/serverlib/resources/data/deploy/tools/configtool.bat
@@ -0,0 +1,25 @@
+@echo off
+
+rem
+rem Script to invoke the ConfigTool class
+rem 
+rem Author: Gregor Karlinger
+rem Version: $Id:  $
+rem
+
+
+if %OS%=="Windows_NT" @setlocal
+
+set CONFIGTOOL=at.gv.egovernment.moa.spss.server.tools.ConfigTool
+set TOOLSPATH=%~p0
+set CLASSPATH=%TOOLSPATH%tools.jar;%TOOLSPATH%xalan.jar;
+
+if "%JAVA_HOME%"=="" goto noJavaHome
+%JAVA_HOME%\bin\java.exe -classpath %CLASSPATH% %CONFIGTOOL% %1 %2 %3 %4 %5 %6 %7 %8 %9
+goto end
+
+:noJavaHome
+echo error: JAVA_HOME not defined
+
+:end
+if %OS%=="Windows_NT" @endlocal
\ No newline at end of file
diff --git a/spss/server/serverlib/resources/data/deploy/tools/configtool.sh b/spss/server/serverlib/resources/data/deploy/tools/configtool.sh
new file mode 100644
index 000000000..f7f29bae1
--- /dev/null
+++ b/spss/server/serverlib/resources/data/deploy/tools/configtool.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+#
+# Script to invoke the ConfigTool class	
+#
+# Author: Gregor Karlinger
+# Version: $Id:  $
+#
+
+
+if [ -z "$JAVA_HOME" ]; then 
+  echo "error: JAVA_HOME not defined";
+  exit;
+fi
+
+CONFIGTOOL=at.gv.egovernment.moa.spss.server.tools.ConfigTool
+TOOLSPATH=`dirname $PWD/$0`
+CLASSPATH=$TOOLSPATH/tools.jar:$TOOLSPATH/xalan.jar
+
+$JAVA_HOME/bin/java -classpath $CLASSPATH $CONFIGTOOL $*
diff --git a/spss/server/serverlib/resources/licenses/Apache-2.0.txt b/spss/server/serverlib/resources/licenses/Apache-2.0.txt
new file mode 100644
index 000000000..57bc88a15
--- /dev/null
+++ b/spss/server/serverlib/resources/licenses/Apache-2.0.txt
@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/spss/server/serverlib/resources/licenses/IAIK-License.txt b/spss/server/serverlib/resources/licenses/IAIK-License.txt
new file mode 100644
index 000000000..c0db63b22
--- /dev/null
+++ b/spss/server/serverlib/resources/licenses/IAIK-License.txt
@@ -0,0 +1,13 @@
+IAIK MOA Runtime Lizenz
+
+Stiftung SIC gewährt dem Lizenznehmer eine nicht-exklusive, nicht-übertragbare 
+Runtime Lizenz für die "IAIK MOA" Module im Kontext von MOA SP/SS und MOA ID. 
+Alle Versuche, Teile oder die kompletten  IAIK Crypto Toolkits, die zusammen 
+mit dem MOA Produktbündel ausgeliefert werden, für andere Zwecke als jenem 
+für Applikationen im MOA Kontext zu verwenden, sind nicht erlaubt. Auch weitere 
+Versuche, die sich auf die Entwicklung von Anwendungen , oder aber darüber hinaus
+auf die Schaffung eines eigenen Toolkits, oder die Aufnahme in ein weiters
+weiteres Toolkit beziehen, sind nicht erlaubt.
+Die hier beschriebene Runtime Lizenz ist nicht übertragbar auf weitere 
+Vertragspartner des Kunden, Personen, Organisationen oder Unternehmen 
+außerhalb der Organisation des Lizenznehmers.
diff --git a/spss/server/serverlib/resources/licenses/Jaxen.txt b/spss/server/serverlib/resources/licenses/Jaxen.txt
new file mode 100644
index 000000000..bef65a520
--- /dev/null
+++ b/spss/server/serverlib/resources/licenses/Jaxen.txt
@@ -0,0 +1,40 @@
+Copyright 2003 (C) The Werken Company. All Rights Reserved.
+ 
+ Redistribution and use of this software and associated documentation
+ ("Software"), with or without modification, are permitted provided
+ that the following conditions are met:
+
+ 1. Redistributions of source code must retain copyright
+    statements and notices.  Redistributions must also contain a
+    copy of this document.
+ 
+ 2. 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.
+ 
+ 3. The name "jaxen" must not be used to endorse or promote
+    products derived from this Software without prior written
+    permission of The Werken Company.  For written permission,
+    please contact bob@werken.com.
+ 
+ 4. Products derived from this Software may not be called "jaxen"
+    nor may "jaxen" appear in their names without prior written
+    permission of The Werken Company. "jaxen" is a registered
+    trademark of The Werken Company.
+ 
+ 5. Due credit should be given to The Werken Company.
+    (http://jaxen.werken.com/).
+ 
+ THIS SOFTWARE IS PROVIDED BY THE WERKEN COMPANY AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESSED 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 WERKEN COMPANY OR ITS 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.
\ No newline at end of file
diff --git a/spss/server/serverlib/resources/licenses/PostgreSQL-JDBC.txt b/spss/server/serverlib/resources/licenses/PostgreSQL-JDBC.txt
new file mode 100644
index 000000000..30d54d778
--- /dev/null
+++ b/spss/server/serverlib/resources/licenses/PostgreSQL-JDBC.txt
@@ -0,0 +1,26 @@
+Copyright (c) 1997-2005, PostgreSQL Global Development Group
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+2. 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.
+3. Neither the name of the PostgreSQL Global Development Group 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.
\ 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
---
 common-test/pom.xml                                | 137 ++--
 common/pom.xml                                     | 151 ++--
 id.server/APACHE-LICENSE-2.0.txt                   | 202 -----
 id.server/IAIK-LICENSE.txt                         |  13 -
 id.server/history.txt                              | 357 --------
 id.server/readme_1.4.0.txt                         | 153 ----
 id/assembly-auth.xml                               | 105 +++
 id/assembly-proxy.xml                              |  93 +++
 id/oa/pom.xml                                      |  43 +-
 id/pom.xml                                         |  46 +-
 id/server/auth/assembly-war.xml                    |  94 ---
 id/server/auth/assembly.xml                        |   7 -
 id/server/auth/pom.xml                             | 204 ++---
 .../data/deploy/templates/moaid-templates.war      | Bin 32185 -> 0 bytes
 id/server/distribution/assembly-auth.xml           |  86 --
 id/server/distribution/assembly-proxy.xml          |  89 --
 id/server/distribution/pom.xml                     | 115 ---
 id/server/doc/moa_id/api-doc/allclasses-frame.html |  44 -
 .../doc/moa_id/api-doc/allclasses-noframe.html     |  44 -
 .../moa/id/AuthenticationException.html            | 251 ------
 .../moa/id/auth/AuthenticationServer.html          | 631 --------------
 .../id/auth/class-use/AuthenticationServer.html    | 172 ----
 .../gv/egovernment/moa/id/auth/package-frame.html  |  32 -
 .../egovernment/moa/id/auth/package-summary.html   | 148 ----
 .../gv/egovernment/moa/id/auth/package-tree.html   | 145 ----
 .../at/gv/egovernment/moa/id/auth/package-use.html | 162 ----
 .../moa/id/class-use/AuthenticationException.html  | 228 ------
 .../moa/id/config/proxy/OAConfiguration.html       | 613 --------------
 .../id/config/proxy/class-use/OAConfiguration.html | 184 -----
 .../moa/id/config/proxy/package-frame.html         |  32 -
 .../moa/id/config/proxy/package-summary.html       | 149 ----
 .../moa/id/config/proxy/package-tree.html          | 145 ----
 .../moa/id/config/proxy/package-use.html           | 163 ----
 .../moa/id/data/AuthenticationData.html            | 906 ---------------------
 .../moa/id/data/class-use/AuthenticationData.html  | 214 -----
 .../gv/egovernment/moa/id/data/package-frame.html  |  32 -
 .../egovernment/moa/id/data/package-summary.html   | 148 ----
 .../gv/egovernment/moa/id/data/package-tree.html   | 145 ----
 .../at/gv/egovernment/moa/id/data/package-use.html | 181 ----
 .../at/gv/egovernment/moa/id/package-frame.html    |  32 -
 .../at/gv/egovernment/moa/id/package-summary.html  | 148 ----
 .../at/gv/egovernment/moa/id/package-tree.html     | 147 ----
 .../at/gv/egovernment/moa/id/package-use.html      | 162 ----
 .../moa/id/proxy/ConnectionBuilder.html            | 249 ------
 .../moa/id/proxy/LoginParameterResolver.html       | 506 ------------
 .../id/proxy/LoginParameterResolverException.html  | 251 ------
 .../moa/id/proxy/NotAllowedException.html          | 253 ------
 .../moa/id/proxy/class-use/ConnectionBuilder.html  | 136 ----
 .../id/proxy/class-use/LoginParameterResolver.html | 136 ----
 .../class-use/LoginParameterResolverException.html | 192 -----
 .../id/proxy/class-use/NotAllowedException.html    | 182 -----
 .../gv/egovernment/moa/id/proxy/package-frame.html |  47 --
 .../egovernment/moa/id/proxy/package-summary.html  | 175 ----
 .../gv/egovernment/moa/id/proxy/package-tree.html  | 154 ----
 .../gv/egovernment/moa/id/proxy/package-use.html   | 170 ----
 id/server/doc/moa_id/api-doc/constant-values.html  | 262 ------
 id/server/doc/moa_id/api-doc/deprecated-list.html  | 134 ---
 id/server/doc/moa_id/api-doc/help-doc.html         | 193 -----
 id/server/doc/moa_id/api-doc/index-all.html        | 462 -----------
 id/server/doc/moa_id/api-doc/index.html            |  26 -
 id/server/doc/moa_id/api-doc/overview-frame.html   |  50 --
 id/server/doc/moa_id/api-doc/overview-summary.html | 165 ----
 id/server/doc/moa_id/api-doc/overview-tree.html    | 155 ----
 id/server/doc/moa_id/api-doc/package-list          |   5 -
 id/server/doc/moa_id/api-doc/packages.html         |  37 -
 id/server/doc/moa_id/api-doc/resources/inherit.gif | Bin 57 -> 0 bytes
 id/server/doc/moa_id/api-doc/serialized-form.html  | 169 ----
 id/server/doc/moa_id/api-doc/stylesheet.css        |  29 -
 id/server/idserverlib/pom.xml                      | 308 ++++---
 id/server/pom.xml                                  | 157 +---
 id/server/proxy/assembly-war.xml                   |  15 +-
 id/server/proxy/pom.xml                            | 318 +++++---
 id/templates/pom.xml                               |  36 +-
 pom.xml                                            | 618 +++++++-------
 repository/dav4j/dav4j/0.1/dav4j-0.1.jar           | Bin 0 -> 323880 bytes
 repository/dav4j/dav4j/0.1/dav4j-0.1.pom           |   7 +
 repository/dav4j/dav4j/maven-metadata-local.xml    |  11 +
 .../httpsclient/JSSE-1.0/httpsclient-JSSE-1.0.jar  | Bin 0 -> 216839 bytes
 .../httpsclient/JSSE-1.0/httpsclient-JSSE-1.0.pom  |   7 +
 .../httpsclient/maven-metadata-local.xml           |  11 +
 .../1.2.4/iaik_Pkcs11Provider-1.2.4.jar            | Bin 0 -> 350831 bytes
 .../1.2.4/iaik_Pkcs11Provider-1.2.4.jar.md5        |   1 +
 .../1.2.4/iaik_Pkcs11Provider-1.2.4.jar.sha1       |   1 +
 .../1.2.4/iaik_Pkcs11Provider-1.2.4.pom            |   7 +
 .../1.2.4/iaik_Pkcs11Provider-1.2.4.pom.md5        |   1 +
 .../1.2.4/iaik_Pkcs11Provider-1.2.4.pom.sha1       |   1 +
 .../iaik_Pkcs11Provider/maven-metadata-central.xml |  13 +
 .../maven-metadata-central.xml.md5                 |   1 +
 .../maven-metadata-central.xml.sha1                |   1 +
 .../prod/iaik_Pkcs11Provider/maven-metadata.xml    |  13 +
 .../iaik_Pkcs11Provider/maven-metadata.xml.md5     |   1 +
 .../iaik_Pkcs11Provider/maven-metadata.xml.sha1    |   1 +
 .../1.2.16/iaik_Pkcs11Wrapper-1.2.16-win32.dll     | Bin 0 -> 98304 bytes
 .../1.2.16/iaik_Pkcs11Wrapper-1.2.16-win32.dll.md5 |   1 +
 .../iaik_Pkcs11Wrapper-1.2.16-win32.dll.sha1       |   1 +
 .../1.2.16/iaik_Pkcs11Wrapper-1.2.16.jar           | Bin 0 -> 257600 bytes
 .../1.2.16/iaik_Pkcs11Wrapper-1.2.16.jar.md5       |   1 +
 .../1.2.16/iaik_Pkcs11Wrapper-1.2.16.jar.sha1      |   1 +
 .../1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom           |   8 +
 .../1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.md5       |   1 +
 .../1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.sha1      |   1 +
 .../iaik_Pkcs11Wrapper/maven-metadata-central.xml  |  13 +
 .../maven-metadata-central.xml.md5                 |   1 +
 .../maven-metadata-central.xml.sha1                |   1 +
 .../prod/iaik_Pkcs11Wrapper/maven-metadata.xml     |  13 +
 .../prod/iaik_Pkcs11Wrapper/maven-metadata.xml.md5 |   1 +
 .../iaik_Pkcs11Wrapper/maven-metadata.xml.sha1     |   1 +
 .../0.2/iaik_X509TrustManager-0.2.jar              | Bin 0 -> 3635 bytes
 .../0.2/iaik_X509TrustManager-0.2.jar.md5          |   1 +
 .../0.2/iaik_X509TrustManager-0.2.jar.sha1         |   1 +
 .../0.2/iaik_X509TrustManager-0.2.pom              |   7 +
 .../0.2/iaik_X509TrustManager-0.2.pom.md5          |   1 +
 .../0.2/iaik_X509TrustManager-0.2.pom.sha1         |   1 +
 .../maven-metadata-central.xml                     |  13 +
 .../maven-metadata-central.xml.md5                 |   1 +
 .../maven-metadata-central.xml.sha1                |   1 +
 .../prod/iaik_X509TrustManager/maven-metadata.xml  |  13 +
 .../iaik_X509TrustManager/maven-metadata.xml.md5   |   1 +
 .../iaik_X509TrustManager/maven-metadata.xml.sha1  |   1 +
 repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.jar | Bin 0 -> 285185 bytes
 .../iaik/prod/iaik_cms/3.2/iaik_cms-3.2.jar.md5    |   1 +
 .../iaik/prod/iaik_cms/3.2/iaik_cms-3.2.jar.sha1   |   1 +
 repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.pom |   7 +
 .../iaik/prod/iaik_cms/3.2/iaik_cms-3.2.pom.md5    |   1 +
 .../iaik/prod/iaik_cms/3.2/iaik_cms-3.2.pom.sha1   |   1 +
 .../iaik/prod/iaik_cms/maven-metadata-central.xml  |  13 +
 .../prod/iaik_cms/maven-metadata-central.xml.md5   |   1 +
 .../prod/iaik_cms/maven-metadata-central.xml.sha1  |   1 +
 repository/iaik/prod/iaik_cms/maven-metadata.xml   |  13 +
 .../iaik/prod/iaik_cms/maven-metadata.xml.md5      |   1 +
 .../iaik/prod/iaik_cms/maven-metadata.xml.sha1     |   1 +
 .../iaik/prod/iaik_ecc/2.15/iaik_ecc-2.15.jar      | Bin 0 -> 134782 bytes
 .../iaik/prod/iaik_ecc/2.15/iaik_ecc-2.15.pom      |   7 +
 .../iaik/prod/iaik_ecc/maven-metadata-local.xml    |  11 +
 .../IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.jar     | Bin 0 -> 204598 bytes
 .../IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.jar.md5 |   1 +
 .../iaik_ixsil-IXSIL-1.2.2.3.jar.sha1              |   1 +
 .../IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.pom     |   7 +
 .../IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.pom.md5 |   1 +
 .../iaik_ixsil-IXSIL-1.2.2.3.pom.sha1              |   1 +
 .../prod/iaik_ixsil/maven-metadata-central.xml     |  13 +
 .../prod/iaik_ixsil/maven-metadata-central.xml.md5 |   1 +
 .../iaik_ixsil/maven-metadata-central.xml.sha1     |   1 +
 repository/iaik/prod/iaik_ixsil/maven-metadata.xml |  13 +
 .../iaik/prod/iaik_ixsil/maven-metadata.xml.md5    |   1 +
 .../iaik/prod/iaik_ixsil/maven-metadata.xml.sha1   |   1 +
 .../3.142_MOA/iaik_jce_full-3.142_MOA.jar          | Bin 0 -> 837275 bytes
 .../3.142_MOA/iaik_jce_full-3.142_MOA.jar.md5      |   1 +
 .../3.142_MOA/iaik_jce_full-3.142_MOA.jar.sha1     |   1 +
 .../3.142_MOA/iaik_jce_full-3.142_MOA.pom          |   7 +
 .../3.142_MOA/iaik_jce_full-3.142_MOA.pom.md5      |   1 +
 .../3.142_MOA/iaik_jce_full-3.142_MOA.pom.sha1     |   1 +
 .../prod/iaik_jce_full/maven-metadata-central.xml  |  13 +
 .../iaik_jce_full/maven-metadata-central.xml.md5   |   1 +
 .../iaik_jce_full/maven-metadata-central.xml.sha1  |   1 +
 .../iaik/prod/iaik_jce_full/maven-metadata.xml     |  13 +
 .../iaik/prod/iaik_jce_full/maven-metadata.xml.md5 |   1 +
 .../prod/iaik_jce_full/maven-metadata.xml.sha1     |   1 +
 .../iaik/prod/iaik_moa/1.20/iaik_moa-1.20.jar      | Bin 0 -> 692493 bytes
 .../iaik/prod/iaik_moa/1.20/iaik_moa-1.20.jar.md5  |   1 +
 .../iaik/prod/iaik_moa/1.20/iaik_moa-1.20.jar.sha1 |   1 +
 .../iaik/prod/iaik_moa/1.20/iaik_moa-1.20.pom      |   7 +
 .../iaik/prod/iaik_moa/1.20/iaik_moa-1.20.pom.md5  |   1 +
 .../iaik/prod/iaik_moa/1.20/iaik_moa-1.20.pom.sha1 |   1 +
 .../iaik/prod/iaik_moa/maven-metadata-central.xml  |  13 +
 .../prod/iaik_moa/maven-metadata-central.xml.md5   |   1 +
 .../prod/iaik_moa/maven-metadata-central.xml.sha1  |   1 +
 repository/iaik/prod/iaik_moa/maven-metadata.xml   |  13 +
 .../iaik/prod/iaik_moa/maven-metadata.xml.md5      |   1 +
 .../iaik/prod/iaik_moa/maven-metadata.xml.sha1     |   1 +
 spss/assembly.xml                                  | 207 +++++
 spss/pom.xml                                       | 246 +-----
 spss/server/distribution/assembly.xml              |  92 ---
 spss/server/distribution/pom.xml                   | 111 ---
 spss/server/history.txt                            | 268 ++++++
 spss/server/pom.xml                                |  46 +-
 spss/server/readme.inst.txt                        |  56 ++
 spss/server/readme.src.txt                         |  77 ++
 spss/server/readme.update.txt                      | 137 ++++
 spss/server/serverlib/pom.xml                      | 197 +++--
 .../resources/data/deploy/tools/certtool.bat       |  25 -
 .../resources/data/deploy/tools/certtool.sh        |  20 -
 .../resources/data/deploy/tools/configtool.bat     |  25 -
 .../resources/data/deploy/tools/configtool.sh      |  20 -
 .../java/at/gv/egovernment/moa/spss/overview.htm   | 155 ----
 .../moa/spss/server/tools/CertTool.java            | 242 ------
 .../moa/spss/server/tools/ConfigTool.java          |  59 --
 .../serverlib/src/main/javadoc/overview.html       | 155 ++++
 spss/server/serverws/assembly.xml                  |  71 --
 spss/server/serverws/pom.xml                       | 199 ++---
 spss/server/tools/pom.xml                          |  34 +
 .../moa/spss/server/tools/CertTool.java            | 242 ++++++
 .../moa/spss/server/tools/ConfigTool.java          |  59 ++
 193 files changed, 2888 insertions(+), 12942 deletions(-)
 delete mode 100644 id.server/APACHE-LICENSE-2.0.txt
 delete mode 100644 id.server/IAIK-LICENSE.txt
 delete mode 100644 id.server/history.txt
 delete mode 100644 id.server/readme_1.4.0.txt
 create mode 100644 id/assembly-auth.xml
 create mode 100644 id/assembly-proxy.xml
 delete mode 100644 id/server/auth/assembly-war.xml
 delete mode 100644 id/server/auth/assembly.xml
 delete mode 100644 id/server/data/deploy/templates/moaid-templates.war
 delete mode 100644 id/server/distribution/assembly-auth.xml
 delete mode 100644 id/server/distribution/assembly-proxy.xml
 delete mode 100644 id/server/distribution/pom.xml
 delete mode 100644 id/server/doc/moa_id/api-doc/allclasses-frame.html
 delete mode 100644 id/server/doc/moa_id/api-doc/allclasses-noframe.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/AuthenticationException.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/AuthenticationServer.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/class-use/AuthenticationServer.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-frame.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-summary.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-tree.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-use.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/class-use/AuthenticationException.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/class-use/OAConfiguration.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-frame.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-summary.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-tree.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-use.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/AuthenticationData.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/class-use/AuthenticationData.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-frame.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-summary.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-tree.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-use.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-frame.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-summary.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-tree.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-use.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/NotAllowedException.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/ConnectionBuilder.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/LoginParameterResolver.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/LoginParameterResolverException.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/NotAllowedException.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-frame.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-summary.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-tree.html
 delete mode 100644 id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-use.html
 delete mode 100644 id/server/doc/moa_id/api-doc/constant-values.html
 delete mode 100644 id/server/doc/moa_id/api-doc/deprecated-list.html
 delete mode 100644 id/server/doc/moa_id/api-doc/help-doc.html
 delete mode 100644 id/server/doc/moa_id/api-doc/index-all.html
 delete mode 100644 id/server/doc/moa_id/api-doc/index.html
 delete mode 100644 id/server/doc/moa_id/api-doc/overview-frame.html
 delete mode 100644 id/server/doc/moa_id/api-doc/overview-summary.html
 delete mode 100644 id/server/doc/moa_id/api-doc/overview-tree.html
 delete mode 100644 id/server/doc/moa_id/api-doc/package-list
 delete mode 100644 id/server/doc/moa_id/api-doc/packages.html
 delete mode 100644 id/server/doc/moa_id/api-doc/resources/inherit.gif
 delete mode 100644 id/server/doc/moa_id/api-doc/serialized-form.html
 delete mode 100644 id/server/doc/moa_id/api-doc/stylesheet.css
 create mode 100644 repository/dav4j/dav4j/0.1/dav4j-0.1.jar
 create mode 100644 repository/dav4j/dav4j/0.1/dav4j-0.1.pom
 create mode 100644 repository/dav4j/dav4j/maven-metadata-local.xml
 create mode 100644 repository/httpsclient/httpsclient/JSSE-1.0/httpsclient-JSSE-1.0.jar
 create mode 100644 repository/httpsclient/httpsclient/JSSE-1.0/httpsclient-JSSE-1.0.pom
 create mode 100644 repository/httpsclient/httpsclient/maven-metadata-local.xml
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.jar
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.jar.md5
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.jar.sha1
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.pom
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.pom.md5
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.pom.sha1
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml.md5
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml.sha1
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml.md5
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml.sha1
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-win32.dll
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-win32.dll.md5
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-win32.dll.sha1
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.jar
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.jar.md5
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.jar.sha1
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.md5
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.sha1
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata-central.xml
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata-central.xml.md5
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata-central.xml.sha1
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.md5
 create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.sha1
 create mode 100644 repository/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.jar
 create mode 100644 repository/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.jar.md5
 create mode 100644 repository/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.jar.sha1
 create mode 100644 repository/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.pom
 create mode 100644 repository/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.pom.md5
 create mode 100644 repository/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.pom.sha1
 create mode 100644 repository/iaik/prod/iaik_X509TrustManager/maven-metadata-central.xml
 create mode 100644 repository/iaik/prod/iaik_X509TrustManager/maven-metadata-central.xml.md5
 create mode 100644 repository/iaik/prod/iaik_X509TrustManager/maven-metadata-central.xml.sha1
 create mode 100644 repository/iaik/prod/iaik_X509TrustManager/maven-metadata.xml
 create mode 100644 repository/iaik/prod/iaik_X509TrustManager/maven-metadata.xml.md5
 create mode 100644 repository/iaik/prod/iaik_X509TrustManager/maven-metadata.xml.sha1
 create mode 100644 repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.jar
 create mode 100644 repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.jar.md5
 create mode 100644 repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.jar.sha1
 create mode 100644 repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.pom
 create mode 100644 repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.pom.md5
 create mode 100644 repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.pom.sha1
 create mode 100644 repository/iaik/prod/iaik_cms/maven-metadata-central.xml
 create mode 100644 repository/iaik/prod/iaik_cms/maven-metadata-central.xml.md5
 create mode 100644 repository/iaik/prod/iaik_cms/maven-metadata-central.xml.sha1
 create mode 100644 repository/iaik/prod/iaik_cms/maven-metadata.xml
 create mode 100644 repository/iaik/prod/iaik_cms/maven-metadata.xml.md5
 create mode 100644 repository/iaik/prod/iaik_cms/maven-metadata.xml.sha1
 create mode 100644 repository/iaik/prod/iaik_ecc/2.15/iaik_ecc-2.15.jar
 create mode 100644 repository/iaik/prod/iaik_ecc/2.15/iaik_ecc-2.15.pom
 create mode 100644 repository/iaik/prod/iaik_ecc/maven-metadata-local.xml
 create mode 100644 repository/iaik/prod/iaik_ixsil/IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.jar
 create mode 100644 repository/iaik/prod/iaik_ixsil/IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.jar.md5
 create mode 100644 repository/iaik/prod/iaik_ixsil/IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.jar.sha1
 create mode 100644 repository/iaik/prod/iaik_ixsil/IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.pom
 create mode 100644 repository/iaik/prod/iaik_ixsil/IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.pom.md5
 create mode 100644 repository/iaik/prod/iaik_ixsil/IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.pom.sha1
 create mode 100644 repository/iaik/prod/iaik_ixsil/maven-metadata-central.xml
 create mode 100644 repository/iaik/prod/iaik_ixsil/maven-metadata-central.xml.md5
 create mode 100644 repository/iaik/prod/iaik_ixsil/maven-metadata-central.xml.sha1
 create mode 100644 repository/iaik/prod/iaik_ixsil/maven-metadata.xml
 create mode 100644 repository/iaik/prod/iaik_ixsil/maven-metadata.xml.md5
 create mode 100644 repository/iaik/prod/iaik_ixsil/maven-metadata.xml.sha1
 create mode 100644 repository/iaik/prod/iaik_jce_full/3.142_MOA/iaik_jce_full-3.142_MOA.jar
 create mode 100644 repository/iaik/prod/iaik_jce_full/3.142_MOA/iaik_jce_full-3.142_MOA.jar.md5
 create mode 100644 repository/iaik/prod/iaik_jce_full/3.142_MOA/iaik_jce_full-3.142_MOA.jar.sha1
 create mode 100644 repository/iaik/prod/iaik_jce_full/3.142_MOA/iaik_jce_full-3.142_MOA.pom
 create mode 100644 repository/iaik/prod/iaik_jce_full/3.142_MOA/iaik_jce_full-3.142_MOA.pom.md5
 create mode 100644 repository/iaik/prod/iaik_jce_full/3.142_MOA/iaik_jce_full-3.142_MOA.pom.sha1
 create mode 100644 repository/iaik/prod/iaik_jce_full/maven-metadata-central.xml
 create mode 100644 repository/iaik/prod/iaik_jce_full/maven-metadata-central.xml.md5
 create mode 100644 repository/iaik/prod/iaik_jce_full/maven-metadata-central.xml.sha1
 create mode 100644 repository/iaik/prod/iaik_jce_full/maven-metadata.xml
 create mode 100644 repository/iaik/prod/iaik_jce_full/maven-metadata.xml.md5
 create mode 100644 repository/iaik/prod/iaik_jce_full/maven-metadata.xml.sha1
 create mode 100644 repository/iaik/prod/iaik_moa/1.20/iaik_moa-1.20.jar
 create mode 100644 repository/iaik/prod/iaik_moa/1.20/iaik_moa-1.20.jar.md5
 create mode 100644 repository/iaik/prod/iaik_moa/1.20/iaik_moa-1.20.jar.sha1
 create mode 100644 repository/iaik/prod/iaik_moa/1.20/iaik_moa-1.20.pom
 create mode 100644 repository/iaik/prod/iaik_moa/1.20/iaik_moa-1.20.pom.md5
 create mode 100644 repository/iaik/prod/iaik_moa/1.20/iaik_moa-1.20.pom.sha1
 create mode 100644 repository/iaik/prod/iaik_moa/maven-metadata-central.xml
 create mode 100644 repository/iaik/prod/iaik_moa/maven-metadata-central.xml.md5
 create mode 100644 repository/iaik/prod/iaik_moa/maven-metadata-central.xml.sha1
 create mode 100644 repository/iaik/prod/iaik_moa/maven-metadata.xml
 create mode 100644 repository/iaik/prod/iaik_moa/maven-metadata.xml.md5
 create mode 100644 repository/iaik/prod/iaik_moa/maven-metadata.xml.sha1
 create mode 100644 spss/assembly.xml
 delete mode 100644 spss/server/distribution/assembly.xml
 delete mode 100644 spss/server/distribution/pom.xml
 create mode 100644 spss/server/history.txt
 create mode 100644 spss/server/readme.inst.txt
 create mode 100644 spss/server/readme.src.txt
 create mode 100644 spss/server/readme.update.txt
 delete mode 100644 spss/server/serverlib/resources/data/deploy/tools/certtool.bat
 delete mode 100644 spss/server/serverlib/resources/data/deploy/tools/certtool.sh
 delete mode 100644 spss/server/serverlib/resources/data/deploy/tools/configtool.bat
 delete mode 100644 spss/server/serverlib/resources/data/deploy/tools/configtool.sh
 delete mode 100644 spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/overview.htm
 delete mode 100644 spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/tools/CertTool.java
 delete mode 100644 spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/tools/ConfigTool.java
 create mode 100644 spss/server/serverlib/src/main/javadoc/overview.html
 delete mode 100644 spss/server/serverws/assembly.xml
 create mode 100644 spss/server/tools/pom.xml
 create mode 100644 spss/server/tools/src/main/java/at/gv/egovernment/moa/spss/server/tools/CertTool.java
 create mode 100644 spss/server/tools/src/main/java/at/gv/egovernment/moa/spss/server/tools/ConfigTool.java

(limited to 'spss/server/serverlib/resources')

diff --git a/common-test/pom.xml b/common-test/pom.xml
index c8ec76281..fc017a907 100644
--- a/common-test/pom.xml
+++ b/common-test/pom.xml
@@ -1,93 +1,52 @@
-<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</groupId>
-		<artifactId>MOA</artifactId>
-		<version>1.4.0</version>
-	</parent>
+<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</groupId>
+        <artifactId>MOA</artifactId>
+        <version>1.4.0</version>
+    </parent>
 
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>MOA</groupId>
-  <artifactId>common-test</artifactId>
-  <version>1.4.0</version>
-  <packaging>jar</packaging>
-  <name>MOA common test-library</name>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>MOA</groupId>
+    <artifactId>moa-common-test</artifactId>
+    <version>1.4.0</version>
+    <packaging>jar</packaging>
+    <name>MOA common test-library</name>
 
- <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <verbose>true</verbose>
-          <fork>true</fork>
-          <executable>${env.BUILD_EXECUTEABLE}</executable>
-          <compilerVersion>${env.BUILD_VERSION}</compilerVersion>
-          <source>1.3</source>
-          <target>1.3</target>
-        </configuration>
-      </plugin>
-    </plugins>
- </build>
+    <properties>
+        <repositoryPath>${basedir}/../repository</repositoryPath>
+    </properties>
 
-  <dependencies>
-    <dependency>
-      <groupId>MOA</groupId>
-      <artifactId>common</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_jce_full</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxen</groupId>
-      <artifactId>jaxen-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxen</groupId>
-      <artifactId>jaxen-dom</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxen</groupId>
-      <artifactId>saxpath</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>jaxp-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jsse</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jnet</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jcert</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>xalan</groupId>
-      <artifactId>xalan</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-    </dependency>    
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xmlParserAPIs</artifactId>
-    </dependency>    
-  </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>MOA</groupId>
+            <artifactId>moa-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_jce_full</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xmlParserAPIs</artifactId>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/common/pom.xml b/common/pom.xml
index ac4dcbda0..91907344f 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -1,98 +1,55 @@
-<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</groupId>
-		<artifactId>MOA</artifactId>
-		<version>1.4.0</version>
-	</parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>MOA</groupId>
-  <artifactId>common</artifactId>
-  <version>1.4.0</version>
-  <packaging>jar</packaging>
-  <name>MOA common library</name>
-  
- <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <verbose>true</verbose>
-          <fork>true</fork>
-          <executable>${env.BUILD_EXECUTEABLE}</executable>
-          <compilerVersion>${env.BUILD_VERSION}</compilerVersion>
-          <source>1.3</source>
-          <target>1.3</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-          	<manifest>
-          		<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-          	</manifest>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
- </build>
- 
-  <dependencies>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_jce_full</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>jaxen</groupId>
-      <artifactId>jaxen-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxen</groupId>
-      <artifactId>jaxen-dom</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxen</groupId>
-      <artifactId>saxpath</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>jaxp-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jsse</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jnet</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jcert</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>xalan</groupId>
-      <artifactId>xalan</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-    </dependency>    
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xmlParserAPIs</artifactId>
-    </dependency>    
-  </dependencies>
+<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</groupId>
+        <artifactId>MOA</artifactId>
+        <version>1.4.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>MOA</groupId>
+    <artifactId>moa-common</artifactId>
+    <version>1.4.0</version>
+    <packaging>jar</packaging>
+    <name>MOA common library</name>
+
+    <properties>
+        <repositoryPath>${basedir}/../repository</repositoryPath>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_jce_full</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>jaxen</groupId>
+            <artifactId>jaxen</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>saxpath</groupId>
+            <artifactId>saxpath</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xmlParserAPIs</artifactId>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/id.server/APACHE-LICENSE-2.0.txt b/id.server/APACHE-LICENSE-2.0.txt
deleted file mode 100644
index d64569567..000000000
--- a/id.server/APACHE-LICENSE-2.0.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/id.server/IAIK-LICENSE.txt b/id.server/IAIK-LICENSE.txt
deleted file mode 100644
index c0db63b22..000000000
--- a/id.server/IAIK-LICENSE.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-IAIK MOA Runtime Lizenz
-
-Stiftung SIC gewährt dem Lizenznehmer eine nicht-exklusive, nicht-übertragbare 
-Runtime Lizenz für die "IAIK MOA" Module im Kontext von MOA SP/SS und MOA ID. 
-Alle Versuche, Teile oder die kompletten  IAIK Crypto Toolkits, die zusammen 
-mit dem MOA Produktbündel ausgeliefert werden, für andere Zwecke als jenem 
-für Applikationen im MOA Kontext zu verwenden, sind nicht erlaubt. Auch weitere 
-Versuche, die sich auf die Entwicklung von Anwendungen , oder aber darüber hinaus
-auf die Schaffung eines eigenen Toolkits, oder die Aufnahme in ein weiters
-weiteres Toolkit beziehen, sind nicht erlaubt.
-Die hier beschriebene Runtime Lizenz ist nicht übertragbar auf weitere 
-Vertragspartner des Kunden, Personen, Organisationen oder Unternehmen 
-außerhalb der Organisation des Lizenznehmers.
diff --git a/id.server/history.txt b/id.server/history.txt
deleted file mode 100644
index e06685aa8..000000000
--- a/id.server/history.txt
+++ /dev/null
@@ -1,357 +0,0 @@
-Dieses Dokument zeigt die Veränderungen und Erweiterungen
-von MOA-ID auf.
-
-History MOA-ID:
-
-=====
-Version MOA-ID 1.4.0: Änderungen seit Version MOA-ID 1.3.3:
-
-Verbesserungen/Erweiterungen:
-- Über konfigurierte Validatoren können mittels des Formularparameters 
-  PushInfobox zusätzlich übergebene Infoboxen geprüft werden (siehe 
-  MOA_ID_1.4_20070802.pdf).
-  
-- IAIK Libraries aktualisiert:
-   Versionsnummern:
-     iaik-jce:           Version 3.142_MOA
-     iaik-cms:           Version 3.2
-     iaikPkcs11Provider: Version 1.2.4
-     iaikPkcs11Wrapper:	 Version 1.2.16
-     ixsil:			         Version IXSIL-1.2.2.1
-     ecc:			           Version v2.15
-     iaik-moa:           Version 1.20
-
-- Neue Mindestanforderung an Java: Version 1.4.0 (1.3.* wird nicht mehr unterstützt)
-	
-- Axis Libraries aktualisiert (auf Version 1.4)
-
-=====
-Version MOA-ID 1.3.3: Änderungen seit Version MOA-ID 1.3.2:
-
-Verbesserungen/Erweiterungen:
-- Unterstützung der Parameterübertragung mittels multipart/form-data in den
-  Servlets VerifyIdentityLinkServlet (Entgegenname der Personenbindung von der
-  BKU) und VerifyAuthBlockServlet (Entgegenname des signierten AuthBlocks von
-  der BKU). Diese Form der Parameterübertragung wurde von Security Layer 
-  Version 1.2 verpflichtend eingeführt. Damit funktioniert MOA-ID nun auch mit 
-  Security Layer Requests der Version 1.2, eine Voraussetzung für die 
-  Verwendung von MOA ID im Bereich der Privatwirtschaft (wbPK als eindeutiges 
-  Personenkennzeichen).
-  
-- Die Templates für den sogenannten AuthBlock, also jenes Dokument, das im Zuge
-  der Anmeldung vom Bürger/Kunden elektronisch signiert wird, wurden erweitert, 
-  dass sowohl aktuelle BKU (strenge Prüfung im Viewer, Anzeigeformat SLXHTML)
-  als auch ältere BKU (z.B. hot:Sign Version 1.3 mit einem propriätären
-  HTML-Dialekt als Anzeigeformat) unterstützt werden.  
-  
-Fixes:
-- Parsen der Personenbindung aus dem an das VerifyIdentityLinkServlet gesendeten
-  InfoboxReadResponse funktioniert nun auch, wenn der InfoboxReadResponse ein
-  anderes als die in den MOA-Konstanten vordefiniertes NS-Präfix verwendet.  
-
-=====
-Version MOA-ID 1.3.2: Änderungen seit Version MOA-ID 1.3.1:
-
-Verbesserungen/Erweiterungen:
-- In der URL an die Servlets SelectBKU bzw. StartAuthentication kann der URL-
-  Parameter Target nun alternativ zur bisher möglichen Form des Bereichskürzels
-  laut E-Gov BerAbgrVO (z.B. BW für Bauen und Wohnen) auch in der Variante 
-  inklusive Präfix (z.B. urn:publicid:gv.at:cdid+BW für Bauen und Wohnen) 
-  angegeben werden.
-
-=====
-Version MOA-ID 1.3.1: Änderungen seit Version MOA-ID 1.3.1D01:
-
-Verbesserungen/Erweiterungen:
-- Templates zur Gestaltung der Seiten "Auswahl der Bürgerkartenumgebung" 
-  und "Anmeldung mit Bürgerkarte" können nun auch über die
-  MOA-ID-Konfigurationsdatei geladen werden.
-
-- IAIK-MOA: CRL wird nun auch akzeptiert, wenn im CLRSigner-Zertifikat KeyUsage 
-            crlSign-Bit nicht gesetzt ist, allerdings nur wenn das Zertifikat 
-	    ein Trust-Anchor ist.
-
-- IAIK-MOA: Eine indirekte CRL wird nun auch akzeptiert, wenn die 
-	    "IssuingDistributionPoint"-Extension fehlt.
-
-Fixes:
-- Logging: commons-logging-1.0.4-Libraries (unterstützt auch Tomcat 5*)
-- bPK Berechnung (bPK wurde bisher falsch berechnet)
-- ist eine Online-Applikation so konfiguriert, dass die Stammzahl
-  nicht an die nachfolgende Applikation weitergegeben werden darf
-  (Parameter "provideStammzahl" hat den Wert "false"), so wird die
-  Stammzahl zwar aus den Anmeldedaten ausgeblendet, nicht aber aus
-  der Personenbindung (wenn Parameter "provideIdentityLink" auf
-  den Wert "true" gesetzt ist. Ab Version 1.3.1 wird die Stammzahl
-  auch aus der Personenbindung entfernt, wenn die Option 
-  "provideStammzahl" aud "false" gesetzt ist.
-- Die Transformationen selektieren bei der Jahreszahl des Geburtsdatums 
-  nur die letzen beiden Stellen für die Anzeige im Trusted Viewer. 
-  Ab Verison 1.3.1 wird die volle Jahreszahl (alle vier Stellen) angezeigt.
-- Überprüfung, ob Geburtsdatum und Name aus dem signierten Login-Request
-  mit den entsprechenden Daten aus der Personenbindung übereinstimmen.
-
-- neue IAIK-JCE-Library: version 3.14
-
-=====
-Version MOA-ID 1.3.1D01: Änderungen seit Version MOA-ID 1.3.0:
-
-Verbesserungen/Erweiterungen:
-- Produktversion wird zur Wiedererkennbarkeit in Manifest.mf der .war Dateien eingetragen
-
-- IAIK-MOA: CRL wird nun auch akzeptiert, wenn im CLRSigner-Zertifikat KeyUsage crlSign-Bit nicht gesetzt ist,
-            allerdings nur wenn das Zertifikat ein Trust-Anchor ist.
-
-- IAIK-MOA: Eine indirekte CRL wird nun auch akzeptiert, wenn die "IssuingDistributionPoint"-Extension fehlt 
-
-Fixes:
-- Logging: commons-logging-1.0.4-Libraries (unterstützt auch Tomcat 5*)
-
-=====
-Version MOA-ID 1.3.0: Änderungen seit Version MOA-ID 1.3.0d01:
-
-Verbesserungen/Erweiterungen:
-- Update der Proxykompnente auf MOA-ID Modus (wbPK)
-
-- Transformationen können nun auch je Onlineapplikation gesetzt werden
-
-- Update PKI auf OCSP (für E-CARD)
-
-- Update der Zertifikatsspeicher und Trustprofile
-
-- IAIK Libraries wieder nur Vollversion
-	Versionsnummern:
-	iaik-jce: 		Version 3.13_3.13_NONEwithRSA (MOA-ID kann nun auch mit JDK1.5 verwendet werden)
-  	iaik-cms:		Version 3.2
-  	iaikPkcs11Provider:	Version 1.1.9
-  	iaikPkcs11Wrapper:	Version 1.2.14
-  	ixsil:			Version IXSIL-1_2_2
-  	ecc:			Version 2.0
-
-=====
-Version MOA-ID 1.3.0d01: Änderungen seit Version MOA-ID 1.2d10:
-
-- Update der Authentisierungskomponente auf MOA-WID Modus (wbPK).
-- Fixes 
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=
-
-=====
-Version MOA-ID 1.2.0d10: Änderungen seit Version MOA-ID 1.2d09:
-
-- Aufspalten der IAIK-Libraries in zwei Verzeichnisse, die jeweils
-  die entsprechenden Voll- bzw. die Evaluierungsversionen enthalten.
-  Versionsnummern:
-  iaik-jce: 			Version 3.13
-  iaik-cms:				Version 3.2
-  iaikPkcs11Provider:	Version 1.1.9
-  iaikPkcs11Wrapper:	Version 1.2.14
-  ixsil:				Version IXSIL-1_2_1_improvedC14N
-  ecc:					Version 2.0
-
-- Anpassen der build.xml-Datei an diese Struktur.
-
-=====
-Version MOA-ID 1.2.0d10: Änderungen seit Version MOA-ID 1.2d09:
-
-- Aufspalten der IAIK-Libraries in zwei Verzeichnisse, die jeweils
-  die entsprechenden Voll- bzw. die Evaluierungsversionen enthalten.
-  Versionsnummern:
-  iaik-jce: 			Version 3.13
-  iaik-cms:				Version 3.2
-  iaikPkcs11Provider:	Version 1.1.9
-  iaikPkcs11Wrapper:	Version 1.2.14
-  ixsil:				Version IXSIL-1_2_1_improvedC14N
-  ecc:					Version 2.0
-
-- Anpassen der build.xml-Datei an diese Struktur.
-
-=====
-Version MOA-ID 1.2.0d12: Änderungen seit Version MOA-ID 1.2d09:
-
-Verbesserungen/Erweiterungen:
-- Proxy ermöglicht nun auch Anmeldungen an WebDAV (RFC 2518) Anwendungen 
-
-- Der MOA-ID-PROXY ermöglicht nun bei Basic Authentication auch eine 
-  etwas gelockertere Vorgangsweise bei der Anmeldung an einen Online-
-  Applikation: So ist es jetzt zusätzlich zur fixen Vorgabe von Benutzernamen 
-  und Passwort möglich das Passwort im Browser eingeben zu lassen oder 
-  sogar eine freie Zuordnung zum Benutzer zu erlauben (Vorteil: es 
-  entfällt die sonst notwendige Wartung der Identities, bzw. das 
-  Mitziehen von durch die Benutzer hervogerufenen Passwortänderungen). 
-  Die Vorgangsweise ist konfigurierbar.
-  
-Fixes:
-- Es gab Umstände, bei denen der MOA-ID-PROXY Cookies verwarf.
-  Dieses Problem ist nun behoben
-
-- Ergänzung des ausgelieferten certstores um wichtige Zertifikate.
-
-=====
-Version MOA-ID 1.2.0d09: Änderungen seit Version MOA-ID 1.2d08:
-
-- Austausch der Bibliothek iaik-moa-full.jar 
-  (ECDSA Signature Encoding)
-  
-- Ergänzung des ausgelieferten certstores um wichtige Zertifikate.
-
-=====
-Version MOA-ID 1.2.0d08: Änderungen seit Version MOA-ID 1.2d07:
-
-- Anpassung des nun in der Personenbindung korrekt verwendeten
-ECDSA Namespaces von http://www.w3.org/2004/01/xmldsig-more# 
-(zwischenzeitlich verwendeter NS) auf 
-http://www.w3.org/2001/04/xmldsig-more# (gemäß Draft)
-
-- Update auf die API Version 1.2.0D04 von MOA-SPSS
-=====
-
-Version MOA-ID 1.2.0d07: Änderungen seit Version MOA-ID 1.2d06:
-
-- Erweiterung um ECC Funktionalität, so dass ECC Karten 
-  (wie z.B. MAESTRO Karten) mit funktionieren
-   
-- Upgrade des Parsers und der XSLT Transform Engine: Die Version 
-  baut nun auf Xerces in der Version xerces-j-2.4.0 und Xalan 
-  in der Version xalan-j-2.5.1 auf.
-  
-=====
-Version MOA-ID 1.2.0d06: Änderungen seit Version MOA-ID 1.2d05:
-
-- Automatische Erkennung des Encodings der BKU Auswahldaten.
-  Eine Unabhängigkeit von locale und default encoding Einstellungen
-  des JDK wurde damit bei der Darstellung der Daten der Auswahlseite
-  erreicht.
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=175
-
-=====
-Version MOA-ID 1.2.0d05: Änderungen seit Version MOA-ID 1.2d04:
-
-Verbesserungen/Erweiterungen:
-
-- Vorlagen für Templates zur Anpassung des Erscheinungsbilds von 
-  MOA-ID wurden hinzugefügt.
-
-- Kompabilität mit aktueller HotSign Version 1.2SR4rev3 wurde erreicht.
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=140
-
-- Upgrade auf neue Loging Bibliothek log4j 1.2.8 
-
-- Update der Dokumentation 
-
-- Tests mit aktueller Tomcat-Version jakarta-tomcat-4.1.30.zip (Windows) 
-  sowie jakarta-tomcat-4.1.30-LE-jdk14.zip (Linux) wurden durchgeführt.
-  
-=====
-Version MOA-ID 1.2.0d04: Änderungen seit Version MOA-ID 1.2d03:
-
-Verbesserungen/Erweiterungen:
-
-- Neue stimmige und übersichtlichere Konfigurationen wurden 
-  erstellt. Trustprofile und certstore für neue Testbürgerkarten
-  a.sign test government und SeLaNext wurden hinzugefügt.
-
-  
-Fixes:
-- StackOverflowError bei a.sign test government Karten behoben
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=131
-
-
-Version MOA-ID 1.2.0d3: Änderungen seit Version MOA-ID 1.1.1:
-
-Verbesserungen/Erweiterungen:
-- Umstellung von vPK auf bPK; von ZMR auf Stammzahl.
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=70
- 
-- Anpassbare JSP Errorpage und Messagepage für Proxy und Auth 
-  Damit die Formatierungen der Benutzermeldungen an die Kundenwünsche 
-  und das CI der Kunden angepasst werden können, wird JSP 
-  Technologie verwendet.
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=100
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=102
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=103
-
-- Ausgabe der gen. Ursache falls eine Signaturprüfung fehlschlägt.
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=101
-
-- Umschaltung CertifiedKeypair / SecureSignatureKeypair
-  Durch die Angabe des Attributs ‚keyBoxIdentifier’ im Element 
-  OnlineApplication eine Auswahl des Schlüsselpaars erfolgen.
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=105
- 
-- Anpassbare JSP Errorpage für MOA-ID Proxy und MOA-ID Auth 
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=70
-
-- Erweiterung des AuthBlocks (SAMLAssertion) um Geburtsdatum
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=114
-  
-- Ergänzung der mitgelieferten Konfiguration 
-  (certstore, trustprofiles auch für Testbürgerkarten)
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=120 
- 
-Fixes:
-- Daten die aus MOA-ID-PROXY an eine OA mittels der 
-  Authentisierungsvariante ParamAuth weitergegeben werden,  
-  müssen URL-Encoded übermittelt werden.
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=104
-
-- Meldung: Fehlerhafter Wert für "DirectoryCertStoreParamet...
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=110
-
-=====
-
-Version MOA-ID 1.1.1: Änderungen seit Version MOA-ID 1.1:
-
-- Fehlermeldungen werden nun im Internet-Explorer unabhängig von dessen
-  Einstellungen bzgl. Fehlermeldungshandling ("Kurze HTTP Fehlermeldungen
-  anzeigen") korrekt dargestellt.
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=26
-
-- Angabe eine speziellen DATA-URL Präfix ist nun möglich (sinnvoll wenn 
-  ein Webserver vorgeschaltet werden soll)
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=63
-
-- Verbesserung der Dokumentation in vielen Details
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=24
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=25
-
-- Ergänzung/Korrektur des WSDL-Files von MOA-ID
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=38
-
-- Die ausgelieferte Default Konfiguration wurde verbessert.
-  ~ Padangaben werden nun relativ zum Konfigurationsfile MOA-ID
-  ausgewertet.
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=49
-  ~ Default Certstore wurde um eine Reihe von Zertifikaten ergänzt.
-  ~ Zwei verschiedene Signaturprüfprofile (für Personenbindung und
-  Authentisierungsdaten) werden nun verwendet. 
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=40
-
-- Die aktuelle Version der MOA-SP Bibliotheken (moa-spss-1.2d01) wurden
-  integriert.
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=62
-
-- Es ist nun per Konfiguration möglich HTTPS Verbindungen auf die 
-  Frontend-Servlets zu erlauben.
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=48
-
-- Falsche Fehlermeldung beim Aufruf von VerifyIdentityLink wurde behoben.
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=50
-
-- Über die Angeabe des Attributs 'loginParameterResolverConfiguration' kann
-  dem LoginParameterResolver der PROXY Komponente eine
-  Initialisierungsparameter mitgegeben werden.
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=71
-
-- FAQ wurde ergänzt
-  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=69
-
-
-- Diverse Detailverbesserungen:
-  https://forge.cio.gv.at/bugzilla/query.cgi
-
-
-
-
-
-
-
diff --git a/id.server/readme_1.4.0.txt b/id.server/readme_1.4.0.txt
deleted file mode 100644
index 24f06f6bc..000000000
--- a/id.server/readme_1.4.0.txt
+++ /dev/null
@@ -1,153 +0,0 @@
-===============================================================================
-MOA ID Version 1.4.0 - Wichtige Informationen zur Installation
-===============================================================================
-
--------------------------------------------------------------------------------
-A. Neuerungen/Änderungen
--------------------------------------------------------------------------------
-
-MOA ID Version 1.4.0 bringt folgende Neuerungen:
-
-- Über konfigurierte Validatoren können mittels des Formularparameters 
-  PushInfobox zusätzlich übergebene Infoboxen geprüft werden. 
-
-- Unterstützung der Parameterübertragung mittels multipart/form-data in den
-  Servlets VerifyIdentityLinkServlet (Entgegennahme der Personenbindung von der
-  BKU) und VerifyAuthBlockServlet (Entgegennahme des signierten AuthBlocks von
-  der BKU). Diese Form der Parameterübertragung wurde von Security Layer 
-  Version 1.2 verpflichtend eingeführt. Damit funktioniert MOA-ID nun auch mit 
-  Security Layer Requests der Version 1.2, was eine Voraussetzung für die 
-  Verwendung von MOA ID im Bereich der Privatwirtschaft (wbPK als eindeutiges 
-  Personenkennzeichen) ist.
-  
-- Ab Version 2.6.x des trustDesk basic von IT Solution GmbH werden Inhalte im 
-  Secure Viewer spezifikationsgemäß und damit strenger als bisher geprüft. Dies 
-  machte es erforderlich Templates für den sogenannten AuthBlock, also jenes 
-  Dokument, das im Zuge der Anmeldung vom Bürger/Kunden elektronisch signiert 
-  wird anzupassen. Damit aus Kompatibilitätsgründen auch noch (zum Beispiel für 
-  eine Übergangsfrist) Versionen < 2.6.x oder die Umsetzung von bdc (hot:Sign 
-  Version 1.3) funktionieren, wurden die Musterkonfigurationen so erweitert, 
-  dass sowohl aktuelle Bürgerkartenumgebungen als auch OPTIONAL ältere BKU 
-  unterstützt werden.  
- 
--------------------------------------------------------------------------------
-B. Gründe für ein Update
--------------------------------------------------------------------------------
-
-Sie sollten Ihre bestehende, ältere Installation von MOA ID auf die Version 
-1.4.0 aktualisieren, wenn einer der folgenden Punkte zutrifft:
-
-- Sie möchten Ihre Installation für Anwendungen im Bereich der Privatwirtschaft
-  verwenden (Verwendung des wirtschaftsbereichspezifischen Personenkennzeichens
-  wbpk) oder verwenden explizit multipart/form-data Parameterübertragung von 
-  Security Layer Version 1.2.
-
-- Es sollen aktuelle Bürgerkartenumgebungen verwendet werden. 
-  
-- Sie möchten Ihre Installation mit Templates für den AuthBlock (also jenes 
-  Dokument, das im Zuge der Anmeldung vom Bürger/Kunden elektronisch signiert 
-  wird) betreiben, die sowohl von aktuellen als auch von älteren Bürgerkarten-
-  umgebungen (BKU) unterstützt werden.
-  
--------------------------------------------------------------------------------
-C. Durchführung des Updates
--------------------------------------------------------------------------------
-  
-...............................................................................
-C.1 Durchführung eines Updates von Version 1.3.1, 1.3.2 oder 1.3.3
-...............................................................................
-
-1. Stoppen Sie den Tomcat, in dem Ihre bisherige Installation betrieben wird.
-   Fertigen Sie eine Sicherungskopie Ihrer kompletten Tomcat-Installation an.
-   
-2. Entpacken Sie die Distribution von MOA ID Auth (moa-id-auth-1.3.3.zip) in
-   ein temporäres Verzeichnis, in weiterer Folge als MOA_ID_AUTH_INST 
-   bezeichnet.   
-
-3. Wechseln Sie in jenes Verzeichnis, das die Webapplikation von MOA ID Auth
-   beinhaltet (für gewöhnlich ist dieses Verzeichnis CATALINA_HOME_ID/webapps,
-   wobei CATALINA_HOME_ID für das Basisverzeichnis der Tomcat-Installation 
-   für MOA ID steht). Löschen Sie darin sowohl die Datei moa-id-auth.war als 
-   auch das komplette Verzeichnis moa-id-auth.
-   
-4. Kopieren Sie die Datei MOA_ID_AUTH_INST/moa-id-auth.war nach
-   CATALINA_HOME_ID/webapps.
-   
-5. Kopieren Sie die vier Dateien aus dem Verzeichnis  
-   MOA_ID_AUTH_INST/conf/moa-id/transforms in das Verzeichnis transforms Ihres
-   Stammverzeichnisses für die MOA ID Konfiguration (für gewöhnlich lautet
-   dieses Stammverzeichnis CATALINA_HOME_ID/conf/moa-id; in weiterer Folge wird
-   davon ausgegangen).
-   
-6. Kopieren Sie die vier Dateien aus dem Verzeichnis 
-   MOA_ID_AUTH_INST/conf/moa-spss/profiles in das Verzeichnis profiles Ihres
-   Stammverzeichnisses für die MOA SPSS Konfiguration (für gewöhnlich lautet
-   dieses Stammverzeichnis CATALINA_HOME_SPSS/conf/moa-spss, wobei 
-   CATALINA_HOME_SPSS für das Basisverzeichnis der Tomcat-Installation 
-   für MOA SPSS steht; wenn Sie MOA SPSS nicht als eigenes Webservice 
-   betreiben, sondern es von MOA ID über die API-Schnittstelle angesprochen
-   wird, lautet dieses Stammverzeichnis für gewöhnlich
-   CATALINA_HOME_ID/conf/moa-spss; in weiterer Folge wird von letzterer 
-   Variante ausgegangen).   
-   
-7. Sollen zusätzliche Templates für ältere Bürgerkartenumgebungen aktiviert
-   werden, öffnen Sie die XML-Konfiguration von MOA ID (für gewöhnlich finden 
-   Sie diese XML-Datei direkt im Stammverzeichnis für die MOA ID Konfiguration, 
-   z.B. CATALINA_HOME_ID/conf/moa-id/SampleMOAIDConfiguration.xml); führen Sie 
-   folgende Modifikationen an der XML-Konfiguration durch:
-   
-   a. Ändern Sie die applikationsübergreifende Konfiguration der AuthBlock
-      Transformationen. Sie finden diese Konfiguration im XML-Element
-      /MOA-IDConfiguration/AuthComponent/SecurityLayer. Fügen Sie zusätzlich zum
-      bisherigen Inhalt dieses Elements (für gewöhnlich ein Element
-      TransformsInfo, dessen Attribut filname den Wert
-      transforms/TransformsInfoAuthBlockText.xml aufweist) ein Element 
-      TransformsInfo an, dessen Attribut filename auf die Datei für ältere BKU 
-      zeigt. Sie können auch auf die vordefinierten Elemente aus den 
-      Musterkonfigurationen dieser Distribution (
-      MOA_ID_AUTH_INST/conf/moa-id/SampleMOAIDConfiguration.xml) zurückgreifen.
-      
-   b. Fügen Sie Profilbezeichner für die Transformationsprofile in der
-      Konfiguration für MOA SP an. Sie finden diesen Bezeichner im XML-
-      Element /MOA-IDConfiguration/AuthComponent/MOA-SP/VerifyAuthBlock.
-      Hängen Sie ein Element VerifyTransformsInfoProfileID an, das für die Über-
-      prüfung der Transformation älterer BKU vorgesehen ist.
-      Siehe auch Inhalt des Elements VerifyAuthBlock aus der Musterkonfiguration 
-      dieser Distribution (
-      MOA_ID_AUTH_INST/conf/moa-id/SampleMOAIDConfiguration.xml).
-      
-   c. Ändern Sie gegebenenfalls die applikationsspezifische Konfiguration
-      der Authblock-Tranformationen. Führen Sie dazu die folgende Tätigkeit
-      für jedes XML-Element /MOA-IDConfiguration/OnlineApplicaton/AuthComponent
-      durch: Fügen Sie zusätzlich zu einem bestehenden Element TransformsInfo 
-      ein Elemnet TransformsInfo an, das die Transformation für ältere BKU 
-      enthält - gleich wie dies bereits in Schritt a. durchgeführt wurde (wenn 
-      Sie dieses Element nicht vorfinden, oder es auskommentiert ist, muss 
-      Schritt c. nicht durchgeführt werden).
-      
-   Öffnen Sie die XML-Konfiguration von MOA SPSS (für gewöhnlich finden Sie 
-   XML-Datei direkt im Stammverzeichnisses für die MOA SPSS Konfiguration, z.B.
-   CATALINA_HOME_ID/conf/moa-spss/SampleMOASPSSConfiguration.xml); führen Sie 
-   folgende Modifikationen an der XML-Konfiguration durch:              
-   
-   a. Ändern Sie die konfigurierten Profile für die zulässigen Transformationen
-      über die signierten Daten. Sie finden diese Profile am Ende der XML-Konfi-
-      guration von MOA SPSS (Elemente des Namens 
-      cfg:VerifyTransformsInfoProfile). Fügen Sie zusätzlich zu den vorkommenden 
-      Elementen dieses Namens (für gewöhnlich zwei Elemente) zwei weitere 
-      Elemente dieses Namens hinzu, die die Profile für die älteren Bürger-
-      kartenumgebungen aufnehmen - diese sind durch den Namensteil "_deprecated" 
-      gekennzeichnet (siehe auch Musterkonfigurationen dieser Distribution 
-      MOA_ID_AUTH_INST/conf/moa-spss/SampleMOASPSSConfiguration.xml).
-      
-8. Starten Sie den Tomcat neu, achten Sie auf eventuelle Fehlermeldungen im
-   Logging von MOA ID beim Einlesen der erneuerten Konfiguration.     
-
-...............................................................................
-C.2 Durchführung eines Updates von einer älteren Version
-...............................................................................
-
-Bitte führen Sie eine Neuinstallation von MOA ID laut Handbuch durch und passen
-Sie die mitgelieferte Musterkonfiguration entsprechend Ihren Bedürfnissen unter 
-Zuhilfenahme Ihrer bisherigen Konfiguration an.
-
diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml
new file mode 100644
index 000000000..e0a1db0c7
--- /dev/null
+++ b/id/assembly-auth.xml
@@ -0,0 +1,105 @@
+<assembly>
+    <id>ID-auth</id>
+
+    <formats>
+        <format>zip</format>
+<!--        <format>tar.gz</format>-->
+    </formats>
+
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <fileSets>
+        <fileSet>
+            <directory>${basedir}/id/server/data/deploy</directory>
+            <outputDirectory>/auth</outputDirectory>
+            <excludes>
+                <exclude>**/conf/moa-id/oa/**</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${basedir}/spss/handbook/conf/moa-spss/certstore</directory>
+            <outputDirectory>/auth/conf/moa-id/certs/certstore</outputDirectory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${basedir}/spss/handbook/conf/moa-spss/certstore</directory>
+            <outputDirectory>/auth/conf/moa-spss/certstore</outputDirectory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${basedir}/id/server/doc</directory>
+            <outputDirectory>/auth/doc</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>${basedir}/licenses</directory>
+            <outputDirectory>/auth</outputDirectory>
+            <includes>
+                <include>APACHE-LICENSE-2.0.txt</include>
+                <include>history.txt</include>
+                <include>IAIK-LICENSE.txt</include>
+                <include>readme_1.4.0.txt</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+
+    <moduleSets>
+        <moduleSet>
+            <includes>
+                <include>MOA.id.server:moa-id-auth</include>
+            </includes>
+            <binaries>
+                <includeDependencies>true</includeDependencies>
+                <outputDirectory>/auth</outputDirectory>
+                <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+                <dependencySets>
+                    <dependencySet>
+                        <includes>
+                            <include>xalan:xalan</include>
+                            <include>xerces:xercesImpl</include>
+                            <include>xerces:xmlParserAPIs</include>
+                        </includes>
+                        <outputDirectory>/auth/endorsed</outputDirectory>
+                    </dependencySet>
+                    <dependencySet>
+                        <includes>
+                            <include>iaik.prod:iaik_ecc</include>
+                            <include>iaik.prod:iaik_jce_full</include>
+                            <include>iaik.prod:iaik_Pkcs11Provider</include>
+                            <include>iaik.prod:iaik_Pkcs11Wrapper</include>
+                        </includes>
+                        <outputDirectory>/auth/ext</outputDirectory>
+                    </dependencySet>
+                </dependencySets>
+                <unpack>false</unpack>
+            </binaries>
+        </moduleSet>
+        <moduleSet>
+            <includes>
+                <include>MOA.id.server:moa-id-lib</include>
+            </includes>
+            <binaries>
+                <attachmentClassifier>javadoc</attachmentClassifier>
+                <includeDependencies>false</includeDependencies>
+                <outputFileNameMapping>api-doc</outputFileNameMapping>
+                <outputDirectory>/auth/moa-id/doc</outputDirectory>
+                <unpack>true</unpack>
+            </binaries>
+        </moduleSet>
+        <moduleSet>
+            <includes>
+                <include>MOA.id:moa-id-templates</include>
+            </includes>
+            <binaries>
+                <includeDependencies>false</includeDependencies>
+                <outputFileNameMapping>moaid-templates.war</outputFileNameMapping>
+                <outputDirectory>/auth/templates</outputDirectory>
+                <unpack>false</unpack>
+            </binaries>
+        </moduleSet>
+    </moduleSets>
+
+</assembly>
\ No newline at end of file
diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml
new file mode 100644
index 000000000..52c9a4f30
--- /dev/null
+++ b/id/assembly-proxy.xml
@@ -0,0 +1,93 @@
+<assembly>
+    <id>ID-proxy</id>
+
+    <formats>
+        <format>zip</format>
+<!--        <format>tar.gz</format>-->
+    </formats>
+
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <fileSets>
+        <fileSet>
+            <directory>${basedir}/id/server/data/deploy</directory>
+            <outputDirectory>/proxy</outputDirectory>
+            <excludes>
+                <exclude>**/conf/moa-spss/**</exclude>
+                <exclude>**/conf/moa-id/transforms/**</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${basedir}/id/server/doc</directory>
+            <outputDirectory>/proxy/doc</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>${basedir}/licenses</directory>
+            <outputDirectory>/proxy</outputDirectory>
+            <includes>
+                <include>APACHE-LICENSE-2.0.txt</include>
+                <include>history.txt</include>
+                <include>IAIK-LICENSE.txt</include>
+                <include>readme_1.4.0.txt</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+
+    <moduleSets>
+        <moduleSet>
+            <includes>
+                <include>MOA.id.server:moa-id-proxy</include>
+            </includes>
+            <binaries>
+                <includeDependencies>true</includeDependencies>
+                <outputDirectory>/proxy</outputDirectory>
+                <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+                <dependencySets>
+                    <dependencySet>
+                        <includes>
+                            <include>xalan:xalan</include>
+                            <include>xerces:xercesImpl</include>
+                            <include>xerces:xmlParserAPIs</include>
+                        </includes>
+                        <outputDirectory>/proxy/endorsed</outputDirectory>
+                    </dependencySet>
+                    <dependencySet>
+                        <includes>
+                            <include>iaik.prod:iaik_ecc</include>
+                            <include>iaik.prod:iaik_jce_full</include>
+                            <include>iaik.prod:iaik_Pkcs11Provider</include>
+                            <include>iaik.prod:iaik_Pkcs11Wrapper</include>
+                        </includes>
+                        <outputDirectory>/proxy/ext</outputDirectory>
+                    </dependencySet>
+                </dependencySets>
+                <unpack>false</unpack>
+            </binaries>
+        </moduleSet>
+        <moduleSet>
+            <includes>
+                <include>MOA.id.server:moa-id-lib</include>
+            </includes>
+            <binaries>
+                <attachmentClassifier>javadoc</attachmentClassifier>
+                <includeDependencies>false</includeDependencies>
+                <outputFileNameMapping>api-doc</outputFileNameMapping>
+                <outputDirectory>/proxy/moa-id/doc</outputDirectory>
+                <unpack>true</unpack>
+            </binaries>
+        </moduleSet>
+        <moduleSet>
+            <includes>
+                <include>MOA.id:moa-id-templates</include>
+            </includes>
+            <binaries>
+                <includeDependencies>false</includeDependencies>
+                <outputFileNameMapping>moaid-templates.war</outputFileNameMapping>
+                <outputDirectory>/proxy/templates</outputDirectory>
+                <unpack>false</unpack>
+            </binaries>
+        </moduleSet>
+    </moduleSets>
+
+
+</assembly>
\ No newline at end of file
diff --git a/id/oa/pom.xml b/id/oa/pom.xml
index fec2e709b..4f6d64b66 100644
--- a/id/oa/pom.xml
+++ b/id/oa/pom.xml
@@ -1,27 +1,18 @@
-<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">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>MOA</groupId>
-  <artifactId>oa</artifactId>
-  <packaging>war</packaging>
-  <version>1.4.0</version>
-  <name>MOA Sample OA</name>
-  
-  <build>
-  	<finalName>oa</finalName>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <verbose>true</verbose>
-          <fork>true</fork>
-          <executable>${env.BUILD_EXECUTEABLE}</executable>
-          <compilerVersion>${env.BUILD_VERSION}</compilerVersion>
-          <source>1.3</source>
-          <target>1.3</target>
-        </configuration>
-      </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">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>MOA</groupId>
+    <artifactId>oa</artifactId>
+    <packaging>war</packaging>
+    <version>1.4.0</version>
+    <name>MOA Sample OA</name>
+
+    <properties>
+        <repositoryPath>${basedir}/../../repository</repositoryPath>
+    </properties>
+
+    <build>
+        <finalName>oa</finalName>
+    </build>
 </project>
diff --git a/id/pom.xml b/id/pom.xml
index e8e58a667..ca374f78b 100644
--- a/id/pom.xml
+++ b/id/pom.xml
@@ -1,22 +1,26 @@
-<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</groupId>
-		<artifactId>MOA</artifactId>
-		<version>1.4.0</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>MOA</groupId>
-  <artifactId>id</artifactId>
-  <packaging>pom</packaging>
-  <version>1.4.0</version>
-  <name>MOA Id</name>
-
-	<modules>
-		<module>oa</module>
-		<module>templates</module>
-		<module>server</module>
-	</modules>
-	
+<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</groupId>
+        <artifactId>MOA</artifactId>
+        <version>1.4.0</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>MOA</groupId>
+    <artifactId>id</artifactId>
+    <packaging>pom</packaging>
+    <version>1.4.0</version>
+    <name>MOA ID</name>
+
+    <modules>
+        <module>oa</module>
+        <module>templates</module>
+        <module>server</module>
+    </modules>
+
+    <properties>
+        <repositoryPath>${basedir}/../repository</repositoryPath>
+    </properties>
+
 </project>
\ No newline at end of file
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
diff --git a/id/server/data/deploy/templates/moaid-templates.war b/id/server/data/deploy/templates/moaid-templates.war
deleted file mode 100644
index 72b034d5c..000000000
Binary files a/id/server/data/deploy/templates/moaid-templates.war and /dev/null differ
diff --git a/id/server/distribution/assembly-auth.xml b/id/server/distribution/assembly-auth.xml
deleted file mode 100644
index a732c6f64..000000000
--- a/id/server/distribution/assembly-auth.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<assembly>
-	<id>all-auth</id>
-
-	<formats>
-		<format>zip</format>
-	</formats>
-
-	<includeBaseDirectory>false</includeBaseDirectory>
-
-	<fileSets>
-		<fileSet>
-			<directory>${basedir}/../data/deploy</directory>
-			<outputDirectory>/auth</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../auth/target</directory>
-			<outputDirectory>/auth</outputDirectory>
-			<includes>
-				<include>**/*.war</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../doc</directory>
-			<outputDirectory>/auth/doc</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../../templates/target</directory>
-			<outputDirectory>/auth/templates</outputDirectory>
-			<includes>
-				<include>**/*.war</include>
-			</includes>
-		</fileSet>		
-		<fileSet>
-			<directory>${basedir}/../data/deploy/templates</directory>
-			<outputDirectory>/auth/templates</outputDirectory>
-			<includes>
-				<include>**/*.txt</include>
-			</includes>
-		</fileSet>		
-		<fileSet>
-			<directory>${basedir}/../data/deploy/tomcat</directory>
-			<outputDirectory>/auth/tomcat</outputDirectory>
-		</fileSet>		
-		<fileSet>
-			<directory>${basedir}/../licenses</directory>
-			<outputDirectory>/auth</outputDirectory>
-			<includes>
-				<include>APACHE-LICENSE-2.0.txt</include>
-				<include>history.txt</include>
-				<include>IAIK-LICENSE.txt</include>
-				<include>readme_1.4.0.txt</include>
-			</includes>
-		</fileSet>		
-	</fileSets>
-
-	<dependencySets>
-		<dependencySet>
-			<includes>
-				<include>xalan:xalan</include>
-				<include>xerces:xercesImpl</include>
-				<include>xerces:xmlParserAPIs</include>
-			</includes>
-			<outputDirectory>/auth/endorsed</outputDirectory>
-		</dependencySet>
-		<dependencySet>
-			<includes>
-				<include>iaik.prod:iaik_ecc</include>
-				<include>iaik.prod:iaik_jce_full</include>
-				<include>iaik.prod:iaik_Pkcs11Provider</include>
-				<include>jsse:jcert</include>
-				<include>jsse:jnet</include>
-				<include>jsse:jsse</include>
-			</includes>
-			<outputDirectory>/auth/ext13</outputDirectory>
-		</dependencySet>
-		<dependencySet>
-			<includes>
-				<include>iaik.prod:iaik_ecc_signed</include>
-				<include>iaik.prod:iaik_jce_full_signed</include>
-				<include>iaik.prod:iaik_Pkcs11Provider_signed</include>
-			</includes>
-			<outputDirectory>/auth/ext14</outputDirectory>
-		</dependencySet>
-	</dependencySets>
-
-</assembly>
\ No newline at end of file
diff --git a/id/server/distribution/assembly-proxy.xml b/id/server/distribution/assembly-proxy.xml
deleted file mode 100644
index cce9dd02c..000000000
--- a/id/server/distribution/assembly-proxy.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<assembly>
-	<id>all-proxy</id>
-
-	<formats>
-		<format>zip</format>
-	</formats>
-
-	<includeBaseDirectory>false</includeBaseDirectory>
-
-	<fileSets>
-		<fileSet>
-			<directory>${basedir}/../data/deploy</directory>
-			<outputDirectory>/proxy</outputDirectory>
-			<excludes>
-				<exclude>**/conf/moa-spss/**</exclude>
-			</excludes>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../proxy/target</directory>
-			<outputDirectory>/proxy</outputDirectory>
-			<includes>
-				<include>**/*.war</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../doc</directory>
-			<outputDirectory>/proxy/doc</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../../templates/target</directory>
-			<outputDirectory>/proxy/templates</outputDirectory>
-			<includes>
-				<include>**/*.war</include>
-			</includes>
-		</fileSet>		
-		<fileSet>
-			<directory>${basedir}/../data/deploy/templates</directory>
-			<outputDirectory>/proxy/templates</outputDirectory>
-			<includes>
-				<include>**/*.txt</include>
-			</includes>
-		</fileSet>		
-		<fileSet>
-			<directory>${basedir}/../data/deploy/tomcat</directory>
-			<outputDirectory>/proxy/tomcat</outputDirectory>
-		</fileSet>		
-		<fileSet>
-			<directory>${basedir}/../licenses</directory>
-			<outputDirectory>/proxy</outputDirectory>
-			<includes>
-				<include>APACHE-LICENSE-2.0.txt</include>
-				<include>history.txt</include>
-				<include>IAIK-LICENSE.txt</include>
-				<include>readme_1.4.0.txt</include>
-			</includes>
-		</fileSet>		
-	</fileSets>
-
-	<dependencySets>
-		<dependencySet>
-			<includes>
-				<include>xalan:xalan</include>
-				<include>xerces:xercesImpl</include>
-				<include>xerces:xmlParserAPIs</include>
-			</includes>
-			<outputDirectory>/proxy/endorsed</outputDirectory>
-		</dependencySet>
-		<dependencySet>
-			<includes>
-				<include>iaik.prod:iaik_ecc</include>
-				<include>iaik.prod:iaik_jce_full</include>
-				<include>iaik.prod:iaik_Pkcs11Provider</include>
-				<include>jsse:jcert</include>
-				<include>jsse:jnet</include>
-				<include>jsse:jsse</include>
-			</includes>
-			<outputDirectory>/proxy/ext13</outputDirectory>
-		</dependencySet>
-		<dependencySet>
-			<includes>
-				<include>iaik.prod:iaik_ecc_signed</include>
-				<include>iaik.prod:iaik_jce_full_signed</include>
-				<include>iaik.prod:iaik_Pkcs11Provider_signed</include>
-			</includes>
-			<outputDirectory>/proxy/ext14</outputDirectory>
-		</dependencySet>
-	</dependencySets>
-
-</assembly>
\ No newline at end of file
diff --git a/id/server/distribution/pom.xml b/id/server/distribution/pom.xml
deleted file mode 100644
index 2bbb3923d..000000000
--- a/id/server/distribution/pom.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<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</groupId>
-  <artifactId>id.server.distribution</artifactId>
-  <packaging>pom</packaging>
-  <version>1.4.0</version>
-  <name>ID-Server-Distribution</name>
-  
-  <properties>
-  	<thirdPartyLib>${basedir}/../../buildhelper</thirdPartyLib>
-  </properties>
-  
-	<build>
-	<plugins>
-		<plugin>
-			<artifactId>maven-assembly-plugin</artifactId>
-			<configuration>
-				<descriptors>
-					<descriptor>./assembly-auth.xml</descriptor>
-					<descriptor>./assembly-proxy.xml</descriptor>
-<!--
-					<descriptor>./assembly-src.xml</descriptor>
--->
-				</descriptors>
-			</configuration>
-			<executions>
-				<execution>
-					<id>make-dist-standalone</id>
-					<phase>package</phase>
-					<goals>
-						<goal>attached</goal>
-					</goals>
-				</execution>
-			</executions>
-		</plugin>
-		</plugins>
-	</build>
-	
-	<dependencies>
-    <dependency>
-      <groupId>xalan</groupId>
-      <artifactId>xalan</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xmlParserAPIs</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_ecc</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_jce_full</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_Pkcs11Provider</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_ecc</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_jce_full</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_Pkcs11Provider</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.win32</groupId>
-      <artifactId>Pkcs11Wrapper</artifactId>
-      <type>dll</type>
-      <version>1.0</version>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jcert</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jnet</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jsse</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-
-	</dependencies>
-</project>
\ No newline at end of file
diff --git a/id/server/doc/moa_id/api-doc/allclasses-frame.html b/id/server/doc/moa_id/api-doc/allclasses-frame.html
deleted file mode 100644
index 9e051d7b1..000000000
--- a/id/server/doc/moa_id/api-doc/allclasses-frame.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-All Classes (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B>All Classes</B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data" target="classFrame">AuthenticationData</A>
-<BR>
-<A HREF="at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id" target="classFrame">AuthenticationException</A>
-<BR>
-<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth" target="classFrame">AuthenticationServer</A>
-<BR>
-<A HREF="at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html" title="interface in at.gv.egovernment.moa.id.proxy" target="classFrame"><I>ConnectionBuilder</I></A>
-<BR>
-<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy" target="classFrame"><I>LoginParameterResolver</I></A>
-<BR>
-<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy" target="classFrame">LoginParameterResolverException</A>
-<BR>
-<A HREF="at/gv/egovernment/moa/id/proxy/NotAllowedException.html" title="class in at.gv.egovernment.moa.id.proxy" target="classFrame">NotAllowedException</A>
-<BR>
-<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy" target="classFrame">OAConfiguration</A>
-<BR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/allclasses-noframe.html b/id/server/doc/moa_id/api-doc/allclasses-noframe.html
deleted file mode 100644
index dc5c0fb5f..000000000
--- a/id/server/doc/moa_id/api-doc/allclasses-noframe.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-All Classes (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B>All Classes</B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<BR>
-<A HREF="at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id">AuthenticationException</A>
-<BR>
-<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth">AuthenticationServer</A>
-<BR>
-<A HREF="at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html" title="interface in at.gv.egovernment.moa.id.proxy"><I>ConnectionBuilder</I></A>
-<BR>
-<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy"><I>LoginParameterResolver</I></A>
-<BR>
-<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy">LoginParameterResolverException</A>
-<BR>
-<A HREF="at/gv/egovernment/moa/id/proxy/NotAllowedException.html" title="class in at.gv.egovernment.moa.id.proxy">NotAllowedException</A>
-<BR>
-<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>
-<BR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/AuthenticationException.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/AuthenticationException.html
deleted file mode 100644
index a11ad6242..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/AuthenticationException.html
+++ /dev/null
@@ -1,251 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-AuthenticationException (MOA ID API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="at.gv.egovernment.moa.id.AuthenticationException class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="AuthenticationException (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/AuthenticationException.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="AuthenticationException.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Object">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-at.gv.egovernment.moa.id</FONT>
-<BR>
-Class AuthenticationException</H2>
-<PRE>
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">java.lang.Object</A>
-  <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by">MOAIDException
-      <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by"><B>at.gv.egovernment.moa.id.AuthenticationException</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>AuthenticationException</B><DT>extends MOAIDException</DL>
-
-<P>
-Exception thrown during handling of AuthenticationSession
-<P>
-
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../serialized-form.html#at.gv.egovernment.moa.id.AuthenticationException">Serialized Form</A></DL>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../at/gv/egovernment/moa/id/AuthenticationException.html#AuthenticationException(java.lang.String, java.lang.Object[])">AuthenticationException</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;messageId,
-                        <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">Object</A>[]&nbsp;parameters)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructor for AuthenticationException.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../at/gv/egovernment/moa/id/AuthenticationException.html#AuthenticationException(java.lang.String, java.lang.Object[], java.lang.Throwable)">AuthenticationException</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;messageId,
-                        <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">Object</A>[]&nbsp;parameters,
-                        <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Throwable.html" title="class or interface in java.lang">Throwable</A>&nbsp;wrapped)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructor for AuthenticationException.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">Object</A></B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#clone()" title="class or interface in java.lang">clone</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang">equals</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#finalize()" title="class or interface in java.lang">finalize</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#getClass()" title="class or interface in java.lang">getClass</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#hashCode()" title="class or interface in java.lang">hashCode</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#notify()" title="class or interface in java.lang">notify</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#notifyAll()" title="class or interface in java.lang">notifyAll</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#toString()" title="class or interface in java.lang">toString</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait()" title="class or interface in java.lang">wait</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait(long)" title="class or interface in java.lang">wait</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait(long, int)" title="class or interface in java.lang">wait</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="AuthenticationException(java.lang.String, java.lang.Object[])"><!-- --></A><H3>
-AuthenticationException</H3>
-<PRE>
-public <B>AuthenticationException</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;messageId,
-                               <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">Object</A>[]&nbsp;parameters)</PRE>
-<DL>
-<DD>Constructor for AuthenticationException.
-<P>
-<DT><B>Parameters:</B><DD><CODE>messageId</CODE> - </DL>
-<HR>
-
-<A NAME="AuthenticationException(java.lang.String, java.lang.Object[], java.lang.Throwable)"><!-- --></A><H3>
-AuthenticationException</H3>
-<PRE>
-public <B>AuthenticationException</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;messageId,
-                               <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">Object</A>[]&nbsp;parameters,
-                               <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Throwable.html" title="class or interface in java.lang">Throwable</A>&nbsp;wrapped)</PRE>
-<DL>
-<DD>Constructor for AuthenticationException.
-<P>
-<DT><B>Parameters:</B><DD><CODE>messageId</CODE> - <DD><CODE>parameters</CODE> - <DD><CODE>wrapped</CODE> - </DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/AuthenticationException.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="AuthenticationException.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Object">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/AuthenticationServer.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/AuthenticationServer.html
deleted file mode 100644
index b5be8a054..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/AuthenticationServer.html
+++ /dev/null
@@ -1,631 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-AuthenticationServer (MOA ID API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="at.gv.egovernment.moa.id.auth.AuthenticationServer class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="AuthenticationServer (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/AuthenticationServer.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="AuthenticationServer.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-at.gv.egovernment.moa.id.auth</FONT>
-<BR>
-Class AuthenticationServer</H2>
-<PRE>
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">java.lang.Object</A>
-  <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><B>at.gv.egovernment.moa.id.auth.AuthenticationServer</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>AuthenticationServer</B><DT>extends <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">Object</A></DL>
-
-<P>
-API for MOA ID Authentication Service.<br>
- <CODE>AuthenticationSession</CODE> is stored in a session store and retrieved
- by giving the session ID.
-<P>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#AuthenticationServer()">AuthenticationServer</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructor for AuthenticationServer.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#cleanup()">cleanup</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Cleans up expired session and authentication data stores.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#debugOutputXMLFile(java.lang.String, org.w3c.dom.Element)">debugOutputXMLFile</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;filename,
-                   org.w3c.dom.Element&nbsp;rootElem)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Writes an XML structure to file for debugging purposes, encoding UTF-8.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#debugOutputXMLFile(java.lang.String, java.lang.String)">debugOutputXMLFile</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;filename,
-                   <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;xmlString)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Writes an XML structure to file for debugging purposes, encoding UTF-8.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#getAuthenticationData(java.lang.String)">getAuthenticationData</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;samlArtifact)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Retrieves <code>AuthenticationData</code> indexed by the SAML artifact.
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth">AuthenticationServer</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#getInstance()">getInstance</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the single instance of <code>AuthenticationServer</code>.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;AuthenticationSession</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#getSession(java.lang.String)">getSession</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;id)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Retrieves a session from the session store.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#selectBKU(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)">selectBKU</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;authURL,
-          <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;target,
-          <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;oaURL,
-          <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;bkuSelectionTemplateURL,
-          <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;templateURL)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Processes request to select a BKU.
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#setSecondsAuthDataTimeOut(long)">setSecondsAuthDataTimeOut</A></B>(long&nbsp;seconds)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the authDataTimeOut.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#setSecondsSessionTimeOut(long)">setSecondsSessionTimeOut</A></B>(long&nbsp;seconds)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the sessionTimeOut.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#startAuthentication(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)">startAuthentication</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;authURL,
-                    <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;target,
-                    <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;oaURL,
-                    <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;templateURL,
-                    <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;bkuURL,
-                    <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;sessionID)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Processes the beginning of an authentication session.
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#verifyAuthenticationBlock(java.lang.String, java.lang.String)">verifyAuthenticationBlock</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;sessionID,
-                          <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;xmlCreateXMLSignatureReadResponse)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Processes a <code>&lt;CreateXMLSignatureResponse&gt;</code> sent by the
- security layer implementation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#verifyIdentityLink(java.lang.String, java.lang.String)">verifyIdentityLink</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;sessionID,
-                   <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;xmlInfoboxReadResponse)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Processes an <code>&lt;InfoboxReadResponse&gt;</code> sent by the 
- security layer implementation.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">Object</A></B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#clone()" title="class or interface in java.lang">clone</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang">equals</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#finalize()" title="class or interface in java.lang">finalize</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#getClass()" title="class or interface in java.lang">getClass</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#hashCode()" title="class or interface in java.lang">hashCode</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#notify()" title="class or interface in java.lang">notify</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#notifyAll()" title="class or interface in java.lang">notifyAll</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#toString()" title="class or interface in java.lang">toString</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait()" title="class or interface in java.lang">wait</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait(long)" title="class or interface in java.lang">wait</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait(long, int)" title="class or interface in java.lang">wait</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="AuthenticationServer()"><!-- --></A><H3>
-AuthenticationServer</H3>
-<PRE>
-public <B>AuthenticationServer</B>()</PRE>
-<DL>
-<DD>Constructor for AuthenticationServer.
-<P>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getInstance()"><!-- --></A><H3>
-getInstance</H3>
-<PRE>
-public static <A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth">AuthenticationServer</A> <B>getInstance</B>()</PRE>
-<DL>
-<DD>Returns the single instance of <code>AuthenticationServer</code>.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the single instance of <code>AuthenticationServer</code></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="selectBKU(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)"><!-- --></A><H3>
-selectBKU</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>selectBKU</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;authURL,
-                        <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;target,
-                        <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;oaURL,
-                        <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;bkuSelectionTemplateURL,
-                        <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;templateURL)
-                 throws WrongParametersException,
-                        <A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id">AuthenticationException</A>,
-                        ConfigurationException,
-                        BuildException</PRE>
-<DL>
-<DD>Processes request to select a BKU.
- <br/>Processing depends on value of <CODE>AuthConfigurationProvider#getBKUSelectionType</CODE>.
- <br/>For <code>bkuSelectionType==HTMLComplete</code>, a <code>returnURI</code> for the 
- "BKU Auswahl" service is returned.
- <br/>For <code>bkuSelectionType==HTMLSelect</code>, an HTML form for BKU selection is returned.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>authURL</CODE> - base URL of MOA-ID Auth component<DD><CODE>target</CODE> - "Gesch&auml;ftsbereich"<DD><CODE>oaURL</CODE> - online application URL requested<DD><CODE>bkuSelectionTemplateURL</CODE> - template for BKU selection form to be used 
-         in case of <code>HTMLSelect</code>; may be null<DD><CODE>templateURL</CODE> - URL providing an HTML template for the HTML form to be used 
-         for call <code>startAuthentication</code>
-<DT><B>Returns:</B><DD>for <code>bkuSelectionType==HTMLComplete</code>, the <code>returnURI</code> for the 
-          "BKU Auswahl" service;
-          for <code>bkuSelectionType==HTMLSelect</code>, an HTML form for BKU selection
-<DT><B>Throws:</B>
-<DD><CODE>WrongParametersException</CODE> - upon missing parameters
-<DD><CODE><A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id">AuthenticationException</A></CODE> - when the configured BKU selection service cannot be reached,
-          and when the given bkuSelectionTemplateURL cannot be reached
-<DD><CODE>ConfigurationException</CODE> - on missing configuration data
-<DD><CODE>BuildException</CODE> - while building the HTML form</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="startAuthentication(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)"><!-- --></A><H3>
-startAuthentication</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>startAuthentication</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;authURL,
-                                  <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;target,
-                                  <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;oaURL,
-                                  <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;templateURL,
-                                  <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;bkuURL,
-                                  <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;sessionID)
-                           throws WrongParametersException,
-                                  <A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id">AuthenticationException</A>,
-                                  ConfigurationException,
-                                  BuildException</PRE>
-<DL>
-<DD>Processes the beginning of an authentication session.
- <ul>
- <li>Starts an authentication session</li>
- <li>Creates an <code>&lt;InfoboxReadRequest&gt;</code></li>
- <li>Creates an HTML form for querying the identity link from the 
- security layer implementation.
- <br>Form parameters include
- 	 <ul>
-   <li>the <code>&lt;InfoboxReadRequest&gt;</code></li>
- 	 <li>the data URL where the security layer implementation sends it response to</li>
-   </ul>
- </ul>
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>authURL</CODE> - URL of the servlet to be used as data URL<DD><CODE>target</CODE> - "Gesch&auml;ftsbereich" of the online application requested<DD><CODE>oaURL</CODE> - online application URL requested<DD><CODE>bkuURL</CODE> - URL of the "B&uuml;rgerkartenumgebung" to be used; 
-                may be <code>null</code>; in this case, the default location will be used<DD><CODE>templateURL</CODE> - URL providing an HTML template for the HTML form generated
-<DT><B>Returns:</B><DD>HTML form
-<DT><B>Throws:</B>
-<DD><CODE><A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id">AuthenticationException</A></CODE>
-<DD><CODE>WrongParametersException</CODE>
-<DD><CODE>ConfigurationException</CODE>
-<DD><CODE>BuildException</CODE><DT><B>See Also:</B><DD><CODE>GetIdentityLinkFormBuilder</CODE>, 
-<CODE>InfoboxReadRequestBuilder</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="verifyIdentityLink(java.lang.String, java.lang.String)"><!-- --></A><H3>
-verifyIdentityLink</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>verifyIdentityLink</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;sessionID,
-                                 <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;xmlInfoboxReadResponse)
-                          throws <A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id">AuthenticationException</A>,
-                                 ParseException,
-                                 ConfigurationException,
-                                 ValidateException,
-                                 ServiceException</PRE>
-<DL>
-<DD>Processes an <code>&lt;InfoboxReadResponse&gt;</code> sent by the 
- security layer implementation.<br>
- <ul>
- <li>Validates given <code>&lt;InfoboxReadResponse&gt;</code></li>
- <li>Parses identity link enclosed in <code>&lt;InfoboxReadResponse&gt;</code></li>
- <li>Verifies identity link by calling the MOA SP component</li>
- <li>Checks certificate authority of identity link</li>
- <li>Stores identity link in the session</li>
- <li>Creates an authentication block to be signed by the user</li>
- <li>Creates and returns a <code>&lt;CreateXMLSignatureRequest&gt;</code> 
-  	 containg the authentication block, meant to be returned to the 
- 		 security layer implementation</li>
- </ul>
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>sessionID</CODE> - ID of associated authentication session data<DD><CODE>xmlInfoboxReadResponse</CODE> - String representation of the
- 				 <code>&lt;InfoboxReadResponse&gt;</code>
-<DT><B>Returns:</B><DD>String representation of the <code>&lt;CreateXMLSignatureRequest&gt;</code>
-<DT><B>Throws:</B>
-<DD><CODE><A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id">AuthenticationException</A></CODE>
-<DD><CODE>ParseException</CODE>
-<DD><CODE>ConfigurationException</CODE>
-<DD><CODE>ValidateException</CODE>
-<DD><CODE>ServiceException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="verifyAuthenticationBlock(java.lang.String, java.lang.String)"><!-- --></A><H3>
-verifyAuthenticationBlock</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>verifyAuthenticationBlock</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;sessionID,
-                                        <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;xmlCreateXMLSignatureReadResponse)
-                                 throws <A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id">AuthenticationException</A>,
-                                        BuildException,
-                                        ParseException,
-                                        ConfigurationException,
-                                        ServiceException,
-                                        ValidateException</PRE>
-<DL>
-<DD>Processes a <code>&lt;CreateXMLSignatureResponse&gt;</code> sent by the
- security layer implementation.<br>
- <ul>
- <li>Validates given <code>&lt;CreateXMLSignatureResponse&gt;</code></li>
- <li>Parses <code>&lt;CreateXMLSignatureResponse&gt;</code> for error codes</li>
- <li>Parses authentication block enclosed in 
- 		 <code>&lt;CreateXMLSignatureResponse&gt;</code></li>
- <li>Verifies authentication block by calling the MOA SP component</li>
- <li>Creates authentication data</li>
- <li>Creates a corresponding SAML artifact</li>
- <li>Stores authentication data in the authentication data store 
- 		 indexed by the SAML artifact</li>
- <li>Deletes authentication session</li>
- <li>Returns the SAML artifact, encoded BASE64</li>
- </ul>
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>sessionID</CODE> - session ID of the running authentication session<DD><CODE>xmlCreateXMLSignatureReadResponse</CODE> - String representation of the 
- 				<code>&lt;CreateXMLSignatureResponse&gt;</code>
-<DT><B>Returns:</B><DD>SAML artifact needed for retrieving authentication data, encoded BASE64
-<DT><B>Throws:</B>
-<DD><CODE><A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id">AuthenticationException</A></CODE>
-<DD><CODE>BuildException</CODE>
-<DD><CODE>ParseException</CODE>
-<DD><CODE>ConfigurationException</CODE>
-<DD><CODE>ServiceException</CODE>
-<DD><CODE>ValidateException</CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getAuthenticationData(java.lang.String)"><!-- --></A><H3>
-getAuthenticationData</H3>
-<PRE>
-public <A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A> <B>getAuthenticationData</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;samlArtifact)
-                                         throws <A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id">AuthenticationException</A></PRE>
-<DL>
-<DD>Retrieves <code>AuthenticationData</code> indexed by the SAML artifact.
- The <code>AuthenticationData</code> is deleted from the store upon end of this call.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD><code>AuthenticationData</code>
-<DT><B>Throws:</B>
-<DD><CODE><A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id">AuthenticationException</A></CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSession(java.lang.String)"><!-- --></A><H3>
-getSession</H3>
-<PRE>
-public static AuthenticationSession <B>getSession</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;id)
-                                        throws <A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id">AuthenticationException</A></PRE>
-<DL>
-<DD>Retrieves a session from the session store.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>id</CODE> - session ID
-<DT><B>Returns:</B><DD><code>AuthenticationSession</code> stored with given session ID,
-          <code>null</code> if session ID unknown
-<DT><B>Throws:</B>
-<DD><CODE><A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id">AuthenticationException</A></CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="cleanup()"><!-- --></A><H3>
-cleanup</H3>
-<PRE>
-public void <B>cleanup</B>()</PRE>
-<DL>
-<DD>Cleans up expired session and authentication data stores.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setSecondsSessionTimeOut(long)"><!-- --></A><H3>
-setSecondsSessionTimeOut</H3>
-<PRE>
-public void <B>setSecondsSessionTimeOut</B>(long&nbsp;seconds)</PRE>
-<DL>
-<DD>Sets the sessionTimeOut.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setSecondsAuthDataTimeOut(long)"><!-- --></A><H3>
-setSecondsAuthDataTimeOut</H3>
-<PRE>
-public void <B>setSecondsAuthDataTimeOut</B>(long&nbsp;seconds)</PRE>
-<DL>
-<DD>Sets the authDataTimeOut.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="debugOutputXMLFile(java.lang.String, org.w3c.dom.Element)"><!-- --></A><H3>
-debugOutputXMLFile</H3>
-<PRE>
-public static void <B>debugOutputXMLFile</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;filename,
-                                      org.w3c.dom.Element&nbsp;rootElem)</PRE>
-<DL>
-<DD>Writes an XML structure to file for debugging purposes, encoding UTF-8.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>filename</CODE> - file name<DD><CODE>rootElem</CODE> - root element in DOM tree</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="debugOutputXMLFile(java.lang.String, java.lang.String)"><!-- --></A><H3>
-debugOutputXMLFile</H3>
-<PRE>
-public static void <B>debugOutputXMLFile</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;filename,
-                                      <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;xmlString)</PRE>
-<DL>
-<DD>Writes an XML structure to file for debugging purposes, encoding UTF-8.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>filename</CODE> - file name<DD><CODE>xmlString</CODE> - XML string</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/AuthenticationServer.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="AuthenticationServer.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/class-use/AuthenticationServer.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/class-use/AuthenticationServer.html
deleted file mode 100644
index 53f0912b1..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/class-use/AuthenticationServer.html
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:52 CET 2004 -->
-<TITLE>
-Uses of Class at.gv.egovernment.moa.id.auth.AuthenticationServer (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class at.gv.egovernment.moa.id.auth.AuthenticationServer (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="AuthenticationServer.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>at.gv.egovernment.moa.id.auth.AuthenticationServer</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth">AuthenticationServer</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#at.gv.egovernment.moa.id.auth"><B>at.gv.egovernment.moa.id.auth</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="at.gv.egovernment.moa.id.auth"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth">AuthenticationServer</A> in <A HREF="../../../../../../../at/gv/egovernment/moa/id/auth/package-summary.html">at.gv.egovernment.moa.id.auth</A></FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../at/gv/egovernment/moa/id/auth/package-summary.html">at.gv.egovernment.moa.id.auth</A> that return <A HREF="../../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth">AuthenticationServer</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="../../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth">AuthenticationServer</A></CODE></FONT></TD>
-<TD><CODE><B>AuthenticationServer.</B><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#getInstance()">getInstance</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the single instance of <code>AuthenticationServer</code>.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="AuthenticationServer.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-frame.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-frame.html
deleted file mode 100644
index 013ac6e16..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-frame.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-at.gv.egovernment.moa.id.auth (MOA ID API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="at.gv.egovernment.moa.id.auth package">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../../../at/gv/egovernment/moa/id/auth/package-summary.html" target="classFrame">at.gv.egovernment.moa.id.auth</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth" target="classFrame">AuthenticationServer</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-summary.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-summary.html
deleted file mode 100644
index 1fadccfd1..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-summary.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-at.gv.egovernment.moa.id.auth (MOA ID API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="at.gv.egovernment.moa.id.auth package">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="at.gv.egovernment.moa.id.auth (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/config/proxy/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package at.gv.egovernment.moa.id.auth
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth">AuthenticationServer</A></B></TD>
-<TD>API for MOA ID Authentication Service.</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/config/proxy/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-tree.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-tree.html
deleted file mode 100644
index ed050ad9e..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-tree.html
+++ /dev/null
@@ -1,145 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-at.gv.egovernment.moa.id.auth Class Hierarchy (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="at.gv.egovernment.moa.id.auth Class Hierarchy (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/config/proxy/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package at.gv.egovernment.moa.id.auth
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">class java.lang.<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang"><B>Object</B></A><UL>
-<LI TYPE="circle">class at.gv.egovernment.moa.id.auth.<A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth"><B>AuthenticationServer</B></A></UL>
-</UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/config/proxy/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-use.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-use.html
deleted file mode 100644
index 54bd8b9fb..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/auth/package-use.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:52 CET 2004 -->
-<TITLE>
-Uses of Package at.gv.egovernment.moa.id.auth (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Package at.gv.egovernment.moa.id.auth (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-use.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Package<br>at.gv.egovernment.moa.id.auth</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../at/gv/egovernment/moa/id/auth/package-summary.html">at.gv.egovernment.moa.id.auth</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#at.gv.egovernment.moa.id.auth"><B>at.gv.egovernment.moa.id.auth</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="at.gv.egovernment.moa.id.auth"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Classes in <A HREF="../../../../../../at/gv/egovernment/moa/id/auth/package-summary.html">at.gv.egovernment.moa.id.auth</A> used by <A HREF="../../../../../../at/gv/egovernment/moa/id/auth/package-summary.html">at.gv.egovernment.moa.id.auth</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../at/gv/egovernment/moa/id/auth/class-use/AuthenticationServer.html#at.gv.egovernment.moa.id.auth"><B>AuthenticationServer</B></A></B>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;API for MOA ID Authentication Service.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-use.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/class-use/AuthenticationException.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/class-use/AuthenticationException.html
deleted file mode 100644
index d844f1ac0..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/class-use/AuthenticationException.html
+++ /dev/null
@@ -1,228 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:52 CET 2004 -->
-<TITLE>
-Uses of Class at.gv.egovernment.moa.id.AuthenticationException (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class at.gv.egovernment.moa.id.AuthenticationException (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="AuthenticationException.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>at.gv.egovernment.moa.id.AuthenticationException</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id">AuthenticationException</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#at.gv.egovernment.moa.id.auth"><B>at.gv.egovernment.moa.id.auth</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="at.gv.egovernment.moa.id.auth"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id">AuthenticationException</A> in <A HREF="../../../../../../at/gv/egovernment/moa/id/auth/package-summary.html">at.gv.egovernment.moa.id.auth</A></FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../at/gv/egovernment/moa/id/auth/package-summary.html">at.gv.egovernment.moa.id.auth</A> that throw <A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id">AuthenticationException</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B>AuthenticationServer.</B><B><A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#selectBKU(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)">selectBKU</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;authURL,
-          <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;target,
-          <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;oaURL,
-          <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;bkuSelectionTemplateURL,
-          <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;templateURL)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Processes request to select a BKU.
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B>AuthenticationServer.</B><B><A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#startAuthentication(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)">startAuthentication</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;authURL,
-                    <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;target,
-                    <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;oaURL,
-                    <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;templateURL,
-                    <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;bkuURL,
-                    <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;sessionID)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Processes the beginning of an authentication session.
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B>AuthenticationServer.</B><B><A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#verifyIdentityLink(java.lang.String, java.lang.String)">verifyIdentityLink</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;sessionID,
-                   <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;xmlInfoboxReadResponse)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Processes an <code>&lt;InfoboxReadResponse&gt;</code> sent by the 
- security layer implementation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B>AuthenticationServer.</B><B><A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#verifyAuthenticationBlock(java.lang.String, java.lang.String)">verifyAuthenticationBlock</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;sessionID,
-                          <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;xmlCreateXMLSignatureReadResponse)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Processes a <code>&lt;CreateXMLSignatureResponse&gt;</code> sent by the
- security layer implementation.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A></CODE></FONT></TD>
-<TD><CODE><B>AuthenticationServer.</B><B><A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#getAuthenticationData(java.lang.String)">getAuthenticationData</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;samlArtifact)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Retrieves <code>AuthenticationData</code> indexed by the SAML artifact.
- </TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;AuthenticationSession</CODE></FONT></TD>
-<TD><CODE><B>AuthenticationServer.</B><B><A HREF="../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#getSession(java.lang.String)">getSession</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;id)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Retrieves a session from the session store.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="AuthenticationException.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html
deleted file mode 100644
index afeb1a482..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html
+++ /dev/null
@@ -1,613 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-OAConfiguration (MOA ID API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="at.gv.egovernment.moa.id.config.proxy.OAConfiguration class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="OAConfiguration (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/OAConfiguration.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="OAConfiguration.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-at.gv.egovernment.moa.id.config.proxy</FONT>
-<BR>
-Class OAConfiguration</H2>
-<PRE>
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">java.lang.Object</A>
-  <IMG SRC="../../../../../../../resources/inherit.gif" ALT="extended by"><B>at.gv.egovernment.moa.id.config.proxy.OAConfiguration</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>OAConfiguration</B><DT>extends <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">Object</A></DL>
-
-<P>
-Holds configuration data concerning an online application for use by the MOA-ID Proxy component.
- These include the login type (stateful or stateless), the HTTP authentication type,
- and information needed to add authentication parameters or headers for a URL connection 
- to the remote online application.
-<P>
-
-<P>
-<DL>
-<DT><B>See Also:</B><DD><code>MOAIDConfiguration-1.1.xsd</code>, element <code>Configuration</code></DL>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#BASIC_AUTH">BASIC_AUTH</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constant for an auth method</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#HEADER_AUTH">HEADER_AUTH</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constant for an auth method</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#LOGINTYPE_STATEFUL">LOGINTYPE_STATEFUL</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constant for an login method</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#LOGINTYPE_STATELESS">LOGINTYPE_STATELESS</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constant for an login method</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#PARAM_AUTH">PARAM_AUTH</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constant for an auth method</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#OAConfiguration()">OAConfiguration</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#getAuthType()">getAuthType</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the authType.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#getBasicAuthPasswordMapping()">getBasicAuthPasswordMapping</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the basicAuthPasswordMapping.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#getBasicAuthUserIDMapping()">getBasicAuthUserIDMapping</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the basicAuthUserIDMapping.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html" title="class or interface in java.util">Map</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#getHeaderAuthMapping()">getHeaderAuthMapping</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the headerAuthMapping.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#getLoginType()">getLoginType</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the loginType.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html" title="class or interface in java.util">Map</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#getParamAuthMapping()">getParamAuthMapping</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the paramAuthMapping.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#setAuthType(java.lang.String)">setAuthType</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;authLoginType)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the authType.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#setBasicAuthPasswordMapping(java.lang.String)">setBasicAuthPasswordMapping</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;basicAuthPassword)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the basicAuthPasswordMapping.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#setBasicAuthUserIDMapping(java.lang.String)">setBasicAuthUserIDMapping</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;basicAuthUserID)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the basicAuthUserIDMapping.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#setHeaderAuthMapping(java.util.HashMap)">setHeaderAuthMapping</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/HashMap.html" title="class or interface in java.util">HashMap</A>&nbsp;headerAuth)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the headerAuthMapping.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#setLoginType(java.lang.String)">setLoginType</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;loginType)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the loginType.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#setParamAuthMapping(java.util.HashMap)">setParamAuthMapping</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/HashMap.html" title="class or interface in java.util">HashMap</A>&nbsp;paramAuth)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the paramAuthMapping.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">Object</A></B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#clone()" title="class or interface in java.lang">clone</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang">equals</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#finalize()" title="class or interface in java.lang">finalize</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#getClass()" title="class or interface in java.lang">getClass</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#hashCode()" title="class or interface in java.lang">hashCode</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#notify()" title="class or interface in java.lang">notify</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#notifyAll()" title="class or interface in java.lang">notifyAll</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#toString()" title="class or interface in java.lang">toString</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait()" title="class or interface in java.lang">wait</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait(long)" title="class or interface in java.lang">wait</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait(long, int)" title="class or interface in java.lang">wait</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="LOGINTYPE_STATEFUL"><!-- --></A><H3>
-LOGINTYPE_STATEFUL</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>LOGINTYPE_STATEFUL</B></PRE>
-<DL>
-<DD>Constant for an login method
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../../constant-values.html#at.gv.egovernment.moa.id.config.proxy.OAConfiguration.LOGINTYPE_STATEFUL">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="LOGINTYPE_STATELESS"><!-- --></A><H3>
-LOGINTYPE_STATELESS</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>LOGINTYPE_STATELESS</B></PRE>
-<DL>
-<DD>Constant for an login method
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../../constant-values.html#at.gv.egovernment.moa.id.config.proxy.OAConfiguration.LOGINTYPE_STATELESS">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="BASIC_AUTH"><!-- --></A><H3>
-BASIC_AUTH</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>BASIC_AUTH</B></PRE>
-<DL>
-<DD>Constant for an auth method
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../../constant-values.html#at.gv.egovernment.moa.id.config.proxy.OAConfiguration.BASIC_AUTH">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="HEADER_AUTH"><!-- --></A><H3>
-HEADER_AUTH</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>HEADER_AUTH</B></PRE>
-<DL>
-<DD>Constant for an auth method
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../../constant-values.html#at.gv.egovernment.moa.id.config.proxy.OAConfiguration.HEADER_AUTH">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="PARAM_AUTH"><!-- --></A><H3>
-PARAM_AUTH</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>PARAM_AUTH</B></PRE>
-<DL>
-<DD>Constant for an auth method
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../../constant-values.html#at.gv.egovernment.moa.id.config.proxy.OAConfiguration.PARAM_AUTH">Constant Field Values</A></DL>
-</DL>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="OAConfiguration()"><!-- --></A><H3>
-OAConfiguration</H3>
-<PRE>
-public <B>OAConfiguration</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getBasicAuthPasswordMapping()"><!-- --></A><H3>
-getBasicAuthPasswordMapping</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>getBasicAuthPasswordMapping</B>()</PRE>
-<DL>
-<DD>Returns the basicAuthPasswordMapping.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getBasicAuthUserIDMapping()"><!-- --></A><H3>
-getBasicAuthUserIDMapping</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>getBasicAuthUserIDMapping</B>()</PRE>
-<DL>
-<DD>Returns the basicAuthUserIDMapping.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getHeaderAuthMapping()"><!-- --></A><H3>
-getHeaderAuthMapping</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html" title="class or interface in java.util">Map</A> <B>getHeaderAuthMapping</B>()</PRE>
-<DL>
-<DD>Returns the headerAuthMapping.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>HashMap</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getLoginType()"><!-- --></A><H3>
-getLoginType</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>getLoginType</B>()</PRE>
-<DL>
-<DD>Returns the loginType.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getParamAuthMapping()"><!-- --></A><H3>
-getParamAuthMapping</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html" title="class or interface in java.util">Map</A> <B>getParamAuthMapping</B>()</PRE>
-<DL>
-<DD>Returns the paramAuthMapping.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>HashMap</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setBasicAuthPasswordMapping(java.lang.String)"><!-- --></A><H3>
-setBasicAuthPasswordMapping</H3>
-<PRE>
-public void <B>setBasicAuthPasswordMapping</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;basicAuthPassword)</PRE>
-<DL>
-<DD>Sets the basicAuthPasswordMapping.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setBasicAuthUserIDMapping(java.lang.String)"><!-- --></A><H3>
-setBasicAuthUserIDMapping</H3>
-<PRE>
-public void <B>setBasicAuthUserIDMapping</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;basicAuthUserID)</PRE>
-<DL>
-<DD>Sets the basicAuthUserIDMapping.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setHeaderAuthMapping(java.util.HashMap)"><!-- --></A><H3>
-setHeaderAuthMapping</H3>
-<PRE>
-public void <B>setHeaderAuthMapping</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/HashMap.html" title="class or interface in java.util">HashMap</A>&nbsp;headerAuth)</PRE>
-<DL>
-<DD>Sets the headerAuthMapping.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setLoginType(java.lang.String)"><!-- --></A><H3>
-setLoginType</H3>
-<PRE>
-public void <B>setLoginType</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;loginType)</PRE>
-<DL>
-<DD>Sets the loginType.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>loginType</CODE> - The loginType to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setParamAuthMapping(java.util.HashMap)"><!-- --></A><H3>
-setParamAuthMapping</H3>
-<PRE>
-public void <B>setParamAuthMapping</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/HashMap.html" title="class or interface in java.util">HashMap</A>&nbsp;paramAuth)</PRE>
-<DL>
-<DD>Sets the paramAuthMapping.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getAuthType()"><!-- --></A><H3>
-getAuthType</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>getAuthType</B>()</PRE>
-<DL>
-<DD>Returns the authType.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setAuthType(java.lang.String)"><!-- --></A><H3>
-setAuthType</H3>
-<PRE>
-public void <B>setAuthType</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;authLoginType)</PRE>
-<DL>
-<DD>Sets the authType.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/OAConfiguration.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="OAConfiguration.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/class-use/OAConfiguration.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/class-use/OAConfiguration.html
deleted file mode 100644
index 5e33084ad..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/class-use/OAConfiguration.html
+++ /dev/null
@@ -1,184 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:52 CET 2004 -->
-<TITLE>
-Uses of Class at.gv.egovernment.moa.id.config.proxy.OAConfiguration (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class at.gv.egovernment.moa.id.config.proxy.OAConfiguration (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="OAConfiguration.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>at.gv.egovernment.moa.id.config.proxy.OAConfiguration</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#at.gv.egovernment.moa.id.proxy"><B>at.gv.egovernment.moa.id.proxy</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="at.gv.egovernment.moa.id.proxy"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A> in <A HREF="../../../../../../../../at/gv/egovernment/moa/id/proxy/package-summary.html">at.gv.egovernment.moa.id.proxy</A></FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../../at/gv/egovernment/moa/id/proxy/package-summary.html">at.gv.egovernment.moa.id.proxy</A> with parameters of type <A HREF="../../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html" title="class or interface in java.util">Map</A></CODE></FONT></TD>
-<TD><CODE><B>LoginParameterResolver.</B><B><A HREF="../../../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#getAuthenticationHeaders(at.gv.egovernment.moa.id.config.proxy.OAConfiguration, at.gv.egovernment.moa.id.data.AuthenticationData, java.lang.String)">getAuthenticationHeaders</A></B>(<A HREF="../../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>&nbsp;oaConf,
-                         <A HREF="../../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>&nbsp;authData,
-                         <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;clientIPAddress)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns authentication headers to be added to a URLConnection.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html" title="class or interface in java.util">Map</A></CODE></FONT></TD>
-<TD><CODE><B>LoginParameterResolver.</B><B><A HREF="../../../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#getAuthenticationParameters(at.gv.egovernment.moa.id.config.proxy.OAConfiguration, at.gv.egovernment.moa.id.data.AuthenticationData, java.lang.String)">getAuthenticationParameters</A></B>(<A HREF="../../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>&nbsp;oaConf,
-                            <A HREF="../../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>&nbsp;authData,
-                            <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;clientIPAddress)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns request parameters to be added to a URLConnection.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="OAConfiguration.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-frame.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-frame.html
deleted file mode 100644
index 442356ce1..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-frame.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-at.gv.egovernment.moa.id.config.proxy (MOA ID API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="at.gv.egovernment.moa.id.config.proxy package">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/package-summary.html" target="classFrame">at.gv.egovernment.moa.id.config.proxy</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy" target="classFrame">OAConfiguration</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-summary.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-summary.html
deleted file mode 100644
index 482aecc48..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-summary.html
+++ /dev/null
@@ -1,149 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-at.gv.egovernment.moa.id.config.proxy (MOA ID API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="at.gv.egovernment.moa.id.config.proxy package">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="at.gv.egovernment.moa.id.config.proxy (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../../at/gv/egovernment/moa/id/auth/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../../at/gv/egovernment/moa/id/data/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package at.gv.egovernment.moa.id.config.proxy
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A></B></TD>
-<TD>Holds configuration data concerning an online application for use by the MOA-ID Proxy component.
- </TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../../at/gv/egovernment/moa/id/auth/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../../at/gv/egovernment/moa/id/data/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-tree.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-tree.html
deleted file mode 100644
index e66568757..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-tree.html
+++ /dev/null
@@ -1,145 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-at.gv.egovernment.moa.id.config.proxy Class Hierarchy (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="at.gv.egovernment.moa.id.config.proxy Class Hierarchy (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../../at/gv/egovernment/moa/id/auth/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../../at/gv/egovernment/moa/id/data/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package at.gv.egovernment.moa.id.config.proxy
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../../../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">class java.lang.<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang"><B>Object</B></A><UL>
-<LI TYPE="circle">class at.gv.egovernment.moa.id.config.proxy.<A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy"><B>OAConfiguration</B></A></UL>
-</UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../../at/gv/egovernment/moa/id/auth/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../../at/gv/egovernment/moa/id/data/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-use.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-use.html
deleted file mode 100644
index 184fcb226..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/config/proxy/package-use.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:52 CET 2004 -->
-<TITLE>
-Uses of Package at.gv.egovernment.moa.id.config.proxy (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Package at.gv.egovernment.moa.id.config.proxy (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-use.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Package<br>at.gv.egovernment.moa.id.config.proxy</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/package-summary.html">at.gv.egovernment.moa.id.config.proxy</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#at.gv.egovernment.moa.id.proxy"><B>at.gv.egovernment.moa.id.proxy</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="at.gv.egovernment.moa.id.proxy"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Classes in <A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/package-summary.html">at.gv.egovernment.moa.id.config.proxy</A> used by <A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/package-summary.html">at.gv.egovernment.moa.id.proxy</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/class-use/OAConfiguration.html#at.gv.egovernment.moa.id.proxy"><B>OAConfiguration</B></A></B>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Holds configuration data concerning an online application for use by the MOA-ID Proxy component.
- </TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-use.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/AuthenticationData.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/AuthenticationData.html
deleted file mode 100644
index d6bc30647..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/AuthenticationData.html
+++ /dev/null
@@ -1,906 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-AuthenticationData (MOA ID API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="at.gv.egovernment.moa.id.data.AuthenticationData class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="AuthenticationData (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/AuthenticationData.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="AuthenticationData.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-at.gv.egovernment.moa.id.data</FONT>
-<BR>
-Class AuthenticationData</H2>
-<PRE>
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">java.lang.Object</A>
-  <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><B>at.gv.egovernment.moa.id.data.AuthenticationData</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>AuthenticationData</B><DT>extends <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">Object</A></DL>
-
-<P>
-Encapsulates authentication data contained in a <code>&lt;saml:Assertion&gt;</code>.
-<P>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#AuthenticationData()">AuthenticationData</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructor for AuthenticationData.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getAssertionID()">getAssertionID</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the assertionID.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getDateOfBirth()">getDateOfBirth</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the dateOfBirth.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getFamilyName()">getFamilyName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the familyName.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getGivenName()">getGivenName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the givenName.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getIdentificationType()">getIdentificationType</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the identificationType</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getIdentificationValue()">getIdentificationValue</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the identificationValue.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getIssueInstant()">getIssueInstant</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the issueInstant.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getIssuer()">getIssuer</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the issuer.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getMajorVersion()">getMajorVersion</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the majorVersion.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getMinorVersion()">getMinorVersion</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the minorVersion.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getPBK()">getPBK</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the bPK.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getPublicAuthorityCode()">getPublicAuthorityCode</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the publicAuthorityCode.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getSamlAssertion()">getSamlAssertion</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the samlAssertion.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Date.html" title="class or interface in java.util">Date</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#getTimestamp()">getTimestamp</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the timestamp.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#isPublicAuthority()">isPublicAuthority</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the publicAuthority.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#isQualifiedCertificate()">isQualifiedCertificate</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the qualifiedCertificate.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setAssertionID(java.lang.String)">setAssertionID</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;assertionID)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the assertionID.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setDateOfBirth(java.lang.String)">setDateOfBirth</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;dateOfBirth)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the dateOfBirth.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setFamilyName(java.lang.String)">setFamilyName</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;gamilyName)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the familyName.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setGivenName(java.lang.String)">setGivenName</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;givenName)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the givenName.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setIdentificationType(java.lang.String)">setIdentificationType</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;identificationType)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the identificationType.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setIdentificationValue(java.lang.String)">setIdentificationValue</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;identificationValue)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the identificationValue.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setIssueInstant(java.lang.String)">setIssueInstant</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;issueInstant)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the issueInstant.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setIssuer(java.lang.String)">setIssuer</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;issuer)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the issuer.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setMajorVersion(int)">setMajorVersion</A></B>(int&nbsp;majorVersion)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the majorVersion.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setMinorVersion(int)">setMinorVersion</A></B>(int&nbsp;minorVersion)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the minorVersion.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setPBK(java.lang.String)">setPBK</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;bPK)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the bPK.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setPublicAuthority(boolean)">setPublicAuthority</A></B>(boolean&nbsp;publicAuthority)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the publicAuthority.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setPublicAuthorityCode(java.lang.String)">setPublicAuthorityCode</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;publicAuthorityIdentification)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the publicAuthorityCode.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setQualifiedCertificate(boolean)">setQualifiedCertificate</A></B>(boolean&nbsp;qualifiedCertificate)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the qualifiedCertificate.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html#setSamlAssertion(java.lang.String)">setSamlAssertion</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;samlAssertion)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the samlAssertion.</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">Object</A></B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#clone()" title="class or interface in java.lang">clone</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang">equals</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#finalize()" title="class or interface in java.lang">finalize</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#getClass()" title="class or interface in java.lang">getClass</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#hashCode()" title="class or interface in java.lang">hashCode</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#notify()" title="class or interface in java.lang">notify</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#notifyAll()" title="class or interface in java.lang">notifyAll</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#toString()" title="class or interface in java.lang">toString</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait()" title="class or interface in java.lang">wait</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait(long)" title="class or interface in java.lang">wait</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait(long, int)" title="class or interface in java.lang">wait</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="AuthenticationData()"><!-- --></A><H3>
-AuthenticationData</H3>
-<PRE>
-public <B>AuthenticationData</B>()</PRE>
-<DL>
-<DD>Constructor for AuthenticationData.
-<P>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getMinorVersion()"><!-- --></A><H3>
-getMinorVersion</H3>
-<PRE>
-public int <B>getMinorVersion</B>()</PRE>
-<DL>
-<DD>Returns the minorVersion.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>int</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isPublicAuthority()"><!-- --></A><H3>
-isPublicAuthority</H3>
-<PRE>
-public boolean <B>isPublicAuthority</B>()</PRE>
-<DL>
-<DD>Returns the publicAuthority.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>boolean</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getPublicAuthorityCode()"><!-- --></A><H3>
-getPublicAuthorityCode</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>getPublicAuthorityCode</B>()</PRE>
-<DL>
-<DD>Returns the publicAuthorityCode.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isQualifiedCertificate()"><!-- --></A><H3>
-isQualifiedCertificate</H3>
-<PRE>
-public boolean <B>isQualifiedCertificate</B>()</PRE>
-<DL>
-<DD>Returns the qualifiedCertificate.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>boolean</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getPBK()"><!-- --></A><H3>
-getPBK</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>getPBK</B>()</PRE>
-<DL>
-<DD>Returns the bPK.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setMinorVersion(int)"><!-- --></A><H3>
-setMinorVersion</H3>
-<PRE>
-public void <B>setMinorVersion</B>(int&nbsp;minorVersion)</PRE>
-<DL>
-<DD>Sets the minorVersion.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>minorVersion</CODE> - The minorVersion to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setPublicAuthority(boolean)"><!-- --></A><H3>
-setPublicAuthority</H3>
-<PRE>
-public void <B>setPublicAuthority</B>(boolean&nbsp;publicAuthority)</PRE>
-<DL>
-<DD>Sets the publicAuthority.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>publicAuthority</CODE> - The publicAuthority to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setPublicAuthorityCode(java.lang.String)"><!-- --></A><H3>
-setPublicAuthorityCode</H3>
-<PRE>
-public void <B>setPublicAuthorityCode</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;publicAuthorityIdentification)</PRE>
-<DL>
-<DD>Sets the publicAuthorityCode.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setQualifiedCertificate(boolean)"><!-- --></A><H3>
-setQualifiedCertificate</H3>
-<PRE>
-public void <B>setQualifiedCertificate</B>(boolean&nbsp;qualifiedCertificate)</PRE>
-<DL>
-<DD>Sets the qualifiedCertificate.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>qualifiedCertificate</CODE> - The qualifiedCertificate to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setPBK(java.lang.String)"><!-- --></A><H3>
-setPBK</H3>
-<PRE>
-public void <B>setPBK</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;bPK)</PRE>
-<DL>
-<DD>Sets the bPK.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>bPK</CODE> - The bPK to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getAssertionID()"><!-- --></A><H3>
-getAssertionID</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>getAssertionID</B>()</PRE>
-<DL>
-<DD>Returns the assertionID.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDateOfBirth()"><!-- --></A><H3>
-getDateOfBirth</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>getDateOfBirth</B>()</PRE>
-<DL>
-<DD>Returns the dateOfBirth.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getFamilyName()"><!-- --></A><H3>
-getFamilyName</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>getFamilyName</B>()</PRE>
-<DL>
-<DD>Returns the familyName.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getGivenName()"><!-- --></A><H3>
-getGivenName</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>getGivenName</B>()</PRE>
-<DL>
-<DD>Returns the givenName.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getIdentificationValue()"><!-- --></A><H3>
-getIdentificationValue</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>getIdentificationValue</B>()</PRE>
-<DL>
-<DD>Returns the identificationValue.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getIdentificationType()"><!-- --></A><H3>
-getIdentificationType</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>getIdentificationType</B>()</PRE>
-<DL>
-<DD>Returns the identificationType
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getIssueInstant()"><!-- --></A><H3>
-getIssueInstant</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>getIssueInstant</B>()</PRE>
-<DL>
-<DD>Returns the issueInstant.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getIssuer()"><!-- --></A><H3>
-getIssuer</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>getIssuer</B>()</PRE>
-<DL>
-<DD>Returns the issuer.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getMajorVersion()"><!-- --></A><H3>
-getMajorVersion</H3>
-<PRE>
-public int <B>getMajorVersion</B>()</PRE>
-<DL>
-<DD>Returns the majorVersion.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>int</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setAssertionID(java.lang.String)"><!-- --></A><H3>
-setAssertionID</H3>
-<PRE>
-public void <B>setAssertionID</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;assertionID)</PRE>
-<DL>
-<DD>Sets the assertionID.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>assertionID</CODE> - The assertionID to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setDateOfBirth(java.lang.String)"><!-- --></A><H3>
-setDateOfBirth</H3>
-<PRE>
-public void <B>setDateOfBirth</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;dateOfBirth)</PRE>
-<DL>
-<DD>Sets the dateOfBirth.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>dateOfBirth</CODE> - The dateOfBirth to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setFamilyName(java.lang.String)"><!-- --></A><H3>
-setFamilyName</H3>
-<PRE>
-public void <B>setFamilyName</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;gamilyName)</PRE>
-<DL>
-<DD>Sets the familyName.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setGivenName(java.lang.String)"><!-- --></A><H3>
-setGivenName</H3>
-<PRE>
-public void <B>setGivenName</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;givenName)</PRE>
-<DL>
-<DD>Sets the givenName.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>givenName</CODE> - The givenName to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setIdentificationValue(java.lang.String)"><!-- --></A><H3>
-setIdentificationValue</H3>
-<PRE>
-public void <B>setIdentificationValue</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;identificationValue)</PRE>
-<DL>
-<DD>Sets the identificationValue.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>identificationValue</CODE> - The identificationValue to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setIdentificationType(java.lang.String)"><!-- --></A><H3>
-setIdentificationType</H3>
-<PRE>
-public void <B>setIdentificationType</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;identificationType)</PRE>
-<DL>
-<DD>Sets the identificationType.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>identificationType</CODE> - The identificationType to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setIssueInstant(java.lang.String)"><!-- --></A><H3>
-setIssueInstant</H3>
-<PRE>
-public void <B>setIssueInstant</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;issueInstant)</PRE>
-<DL>
-<DD>Sets the issueInstant.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>issueInstant</CODE> - The issueInstant to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setIssuer(java.lang.String)"><!-- --></A><H3>
-setIssuer</H3>
-<PRE>
-public void <B>setIssuer</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;issuer)</PRE>
-<DL>
-<DD>Sets the issuer.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>issuer</CODE> - The issuer to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setMajorVersion(int)"><!-- --></A><H3>
-setMajorVersion</H3>
-<PRE>
-public void <B>setMajorVersion</B>(int&nbsp;majorVersion)</PRE>
-<DL>
-<DD>Sets the majorVersion.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>majorVersion</CODE> - The majorVersion to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSamlAssertion()"><!-- --></A><H3>
-getSamlAssertion</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>getSamlAssertion</B>()</PRE>
-<DL>
-<DD>Returns the samlAssertion.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>String</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setSamlAssertion(java.lang.String)"><!-- --></A><H3>
-setSamlAssertion</H3>
-<PRE>
-public void <B>setSamlAssertion</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;samlAssertion)</PRE>
-<DL>
-<DD>Sets the samlAssertion.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>samlAssertion</CODE> - The samlAssertion to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTimestamp()"><!-- --></A><H3>
-getTimestamp</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Date.html" title="class or interface in java.util">Date</A> <B>getTimestamp</B>()</PRE>
-<DL>
-<DD>Returns the timestamp.
-<P>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>Date</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/AuthenticationData.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="AuthenticationData.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/class-use/AuthenticationData.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/class-use/AuthenticationData.html
deleted file mode 100644
index 44c47942a..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/class-use/AuthenticationData.html
+++ /dev/null
@@ -1,214 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:52 CET 2004 -->
-<TITLE>
-Uses of Class at.gv.egovernment.moa.id.data.AuthenticationData (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class at.gv.egovernment.moa.id.data.AuthenticationData (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="AuthenticationData.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>at.gv.egovernment.moa.id.data.AuthenticationData</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#at.gv.egovernment.moa.id.auth"><B>at.gv.egovernment.moa.id.auth</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#at.gv.egovernment.moa.id.proxy"><B>at.gv.egovernment.moa.id.proxy</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="at.gv.egovernment.moa.id.auth"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A> in <A HREF="../../../../../../../at/gv/egovernment/moa/id/auth/package-summary.html">at.gv.egovernment.moa.id.auth</A></FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../at/gv/egovernment/moa/id/auth/package-summary.html">at.gv.egovernment.moa.id.auth</A> that return <A HREF="../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A></CODE></FONT></TD>
-<TD><CODE><B>AuthenticationServer.</B><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/auth/AuthenticationServer.html#getAuthenticationData(java.lang.String)">getAuthenticationData</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;samlArtifact)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Retrieves <code>AuthenticationData</code> indexed by the SAML artifact.
- </TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="at.gv.egovernment.moa.id.proxy"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A> in <A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/package-summary.html">at.gv.egovernment.moa.id.proxy</A></FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/package-summary.html">at.gv.egovernment.moa.id.proxy</A> with parameters of type <A HREF="../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html" title="class or interface in java.util">Map</A></CODE></FONT></TD>
-<TD><CODE><B>LoginParameterResolver.</B><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#getAuthenticationHeaders(at.gv.egovernment.moa.id.config.proxy.OAConfiguration, at.gv.egovernment.moa.id.data.AuthenticationData, java.lang.String)">getAuthenticationHeaders</A></B>(<A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>&nbsp;oaConf,
-                         <A HREF="../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>&nbsp;authData,
-                         <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;clientIPAddress)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns authentication headers to be added to a URLConnection.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html" title="class or interface in java.util">Map</A></CODE></FONT></TD>
-<TD><CODE><B>LoginParameterResolver.</B><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#getAuthenticationParameters(at.gv.egovernment.moa.id.config.proxy.OAConfiguration, at.gv.egovernment.moa.id.data.AuthenticationData, java.lang.String)">getAuthenticationParameters</A></B>(<A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>&nbsp;oaConf,
-                            <A HREF="../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>&nbsp;authData,
-                            <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;clientIPAddress)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns request parameters to be added to a URLConnection.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="AuthenticationData.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-frame.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-frame.html
deleted file mode 100644
index b3be4f39a..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-frame.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-at.gv.egovernment.moa.id.data (MOA ID API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="at.gv.egovernment.moa.id.data package">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../../../at/gv/egovernment/moa/id/data/package-summary.html" target="classFrame">at.gv.egovernment.moa.id.data</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data" target="classFrame">AuthenticationData</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-summary.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-summary.html
deleted file mode 100644
index 28b8dd351..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-summary.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-at.gv.egovernment.moa.id.data (MOA ID API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="at.gv.egovernment.moa.id.data package">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="at.gv.egovernment.moa.id.data (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/config/proxy/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package at.gv.egovernment.moa.id.data
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A></B></TD>
-<TD>Encapsulates authentication data contained in a <code>&lt;saml:Assertion&gt;</code>.</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/config/proxy/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-tree.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-tree.html
deleted file mode 100644
index 6911edcdb..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-tree.html
+++ /dev/null
@@ -1,145 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-at.gv.egovernment.moa.id.data Class Hierarchy (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="at.gv.egovernment.moa.id.data Class Hierarchy (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/config/proxy/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package at.gv.egovernment.moa.id.data
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">class java.lang.<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang"><B>Object</B></A><UL>
-<LI TYPE="circle">class at.gv.egovernment.moa.id.data.<A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data"><B>AuthenticationData</B></A></UL>
-</UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/config/proxy/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-use.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-use.html
deleted file mode 100644
index c90a703c9..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/data/package-use.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:52 CET 2004 -->
-<TITLE>
-Uses of Package at.gv.egovernment.moa.id.data (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Package at.gv.egovernment.moa.id.data (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-use.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Package<br>at.gv.egovernment.moa.id.data</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../at/gv/egovernment/moa/id/data/package-summary.html">at.gv.egovernment.moa.id.data</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#at.gv.egovernment.moa.id.auth"><B>at.gv.egovernment.moa.id.auth</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#at.gv.egovernment.moa.id.proxy"><B>at.gv.egovernment.moa.id.proxy</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="at.gv.egovernment.moa.id.auth"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Classes in <A HREF="../../../../../../at/gv/egovernment/moa/id/data/package-summary.html">at.gv.egovernment.moa.id.data</A> used by <A HREF="../../../../../../at/gv/egovernment/moa/id/auth/package-summary.html">at.gv.egovernment.moa.id.auth</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/class-use/AuthenticationData.html#at.gv.egovernment.moa.id.auth"><B>AuthenticationData</B></A></B>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Encapsulates authentication data contained in a <code>&lt;saml:Assertion&gt;</code>.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="at.gv.egovernment.moa.id.proxy"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Classes in <A HREF="../../../../../../at/gv/egovernment/moa/id/data/package-summary.html">at.gv.egovernment.moa.id.data</A> used by <A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/package-summary.html">at.gv.egovernment.moa.id.proxy</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../at/gv/egovernment/moa/id/data/class-use/AuthenticationData.html#at.gv.egovernment.moa.id.proxy"><B>AuthenticationData</B></A></B>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Encapsulates authentication data contained in a <code>&lt;saml:Assertion&gt;</code>.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-use.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-frame.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-frame.html
deleted file mode 100644
index 9c4352356..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-frame.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-at.gv.egovernment.moa.id (MOA ID API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="at.gv.egovernment.moa.id package">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../../at/gv/egovernment/moa/id/package-summary.html" target="classFrame">at.gv.egovernment.moa.id</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="AuthenticationException.html" title="class in at.gv.egovernment.moa.id" target="classFrame">AuthenticationException</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-summary.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-summary.html
deleted file mode 100644
index 3750976f2..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-summary.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-at.gv.egovernment.moa.id (MOA ID API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="at.gv.egovernment.moa.id package">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="at.gv.egovernment.moa.id (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV PACKAGE&nbsp;
-&nbsp;<A HREF="../../../../../at/gv/egovernment/moa/id/auth/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package at.gv.egovernment.moa.id
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id">AuthenticationException</A></B></TD>
-<TD>Exception thrown during handling of AuthenticationSession</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV PACKAGE&nbsp;
-&nbsp;<A HREF="../../../../../at/gv/egovernment/moa/id/auth/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-tree.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-tree.html
deleted file mode 100644
index ebf3b1498..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-tree.html
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-at.gv.egovernment.moa.id Class Hierarchy (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="at.gv.egovernment.moa.id Class Hierarchy (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;<A HREF="../../../../../at/gv/egovernment/moa/id/auth/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package at.gv.egovernment.moa.id
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">class java.lang.<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang"><B>Object</B></A><UL>
-<LI TYPE="circle">class MOAIDException<UL>
-<LI TYPE="circle">class at.gv.egovernment.moa.id.<A HREF="../../../../../at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id"><B>AuthenticationException</B></A></UL>
-</UL>
-</UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;<A HREF="../../../../../at/gv/egovernment/moa/id/auth/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-use.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-use.html
deleted file mode 100644
index bc895c974..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/package-use.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:52 CET 2004 -->
-<TITLE>
-Uses of Package at.gv.egovernment.moa.id (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Package at.gv.egovernment.moa.id (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-use.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Package<br>at.gv.egovernment.moa.id</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../at/gv/egovernment/moa/id/package-summary.html">at.gv.egovernment.moa.id</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#at.gv.egovernment.moa.id.auth"><B>at.gv.egovernment.moa.id.auth</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="at.gv.egovernment.moa.id.auth"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Classes in <A HREF="../../../../../at/gv/egovernment/moa/id/package-summary.html">at.gv.egovernment.moa.id</A> used by <A HREF="../../../../../at/gv/egovernment/moa/id/auth/package-summary.html">at.gv.egovernment.moa.id.auth</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../at/gv/egovernment/moa/id/class-use/AuthenticationException.html#at.gv.egovernment.moa.id.auth"><B>AuthenticationException</B></A></B>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Exception thrown during handling of AuthenticationSession</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-use.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html
deleted file mode 100644
index 398be7e71..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html
+++ /dev/null
@@ -1,249 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-ConnectionBuilder (MOA ID API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="at.gv.egovernment.moa.id.proxy.ConnectionBuilder interface">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ConnectionBuilder (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ConnectionBuilder.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ConnectionBuilder.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-at.gv.egovernment.moa.id.proxy</FONT>
-<BR>
-Interface ConnectionBuilder</H2>
-<HR>
-<DL>
-<DT>public interface <B>ConnectionBuilder</B></DL>
-
-<P>
-Builder for <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URLConnection.html" title="class or interface in java.net"><CODE>URLConnection</CODE></A> objects used to forward requests
- to the remote online application.
-<P>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/HttpURLConnection.html" title="class or interface in java.net">HttpURLConnection</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html#buildConnection(javax.servlet.http.HttpServletRequest, java.lang.String, java.lang.String, javax.net.ssl.SSLSocketFactory, java.util.Map)">buildConnection</A></B>(javax.servlet.http.HttpServletRequest&nbsp;request,
-                <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;publicURLPrefix,
-                <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;realURLPrefix,
-                javax.net.ssl.SSLSocketFactory&nbsp;sslSocketFactory,
-                <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html" title="class or interface in java.util">Map</A>&nbsp;parameters)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Builds an HttpURLConnection to a <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URL.html" title="class or interface in java.net"><CODE>URL</CODE></A> which is derived
- from an <CODE>HttpServletRequest</CODE> URL, by substitution of a 
- public URL prefix for the real URL prefix.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="buildConnection(javax.servlet.http.HttpServletRequest, java.lang.String, java.lang.String, javax.net.ssl.SSLSocketFactory, java.util.Map)"><!-- --></A><H3>
-buildConnection</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/HttpURLConnection.html" title="class or interface in java.net">HttpURLConnection</A> <B>buildConnection</B>(javax.servlet.http.HttpServletRequest&nbsp;request,
-                                         <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;publicURLPrefix,
-                                         <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;realURLPrefix,
-                                         javax.net.ssl.SSLSocketFactory&nbsp;sslSocketFactory,
-                                         <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html" title="class or interface in java.util">Map</A>&nbsp;parameters)
-                                  throws <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/io/IOException.html" title="class or interface in java.io">IOException</A></PRE>
-<DL>
-<DD>Builds an HttpURLConnection to a <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URL.html" title="class or interface in java.net"><CODE>URL</CODE></A> which is derived
- from an <CODE>HttpServletRequest</CODE> URL, by substitution of a 
- public URL prefix for the real URL prefix.<br>
- The HttpURLConnection has been created by <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URL.html#openConnection()" title="class or interface in java.net"><CODE>URL.openConnection()</CODE></A>, but
- it has not yet been connected to by <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URLConnection.html#connect()" title="class or interface in java.net"><CODE>URLConnection.connect()</CODE></A>.<br>
- The field settings of the HttpURLConnection are:
- <ul>
- <li><code>allowUserInteraction = false</code></li>
- <li><code>doInput = true</code></li>
- <li><code>doOutput = true</code></li>
- <li><code>requestMethod = request.getMethod()</code></li>
- <li><code>useCaches = false</code></li>
- </ul>
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>request</CODE> - the incoming request which shall be forwarded<DD><CODE>publicURLPrefix</CODE> - the public URL prefix to be substituted by the real URL prefix<DD><CODE>realURLPrefix</CODE> - the URL prefix to substitute the public URL prefix<DD><CODE>sslSocketFactory</CODE> - factory to be used for creating an SSL socket in case
-         of a URL for scheme <code>"https:"</code>;
- 				 <br>if <code>null</code>, the default SSL socket factory would be used<DD><CODE>parameters</CODE> - parameters to be forwarded
-<DT><B>Returns:</B><DD>a URLConnection created by <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URL.html#openConnection()" title="class or interface in java.net"><CODE>URL.openConnection()</CODE></A>, connecting to 
- 					the requested URL with <code>publicURLPrefix</code> substituted by <code>realURLPrefix</code>
-<DT><B>Throws:</B>
-<DD><CODE><A HREF="http://java.sun.com/j2se/1.3/docs/api/java/io/IOException.html" title="class or interface in java.io">IOException</A></CODE> - if an I/O exception occurs during opening the connection<DT><B>See Also:</B><DD><A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URL.html#openConnection()" title="class or interface in java.net"><CODE>URL.openConnection()</CODE></A>, 
-<CODE>com.sun.net.ssl.HttpsURLConnection#getDefaultSSLSocketFactory()</CODE></DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ConnectionBuilder.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ConnectionBuilder.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html
deleted file mode 100644
index 0b2926e55..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html
+++ /dev/null
@@ -1,506 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-LoginParameterResolver (MOA ID API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="at.gv.egovernment.moa.id.proxy.LoginParameterResolver interface">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="LoginParameterResolver (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/LoginParameterResolver.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html" title="interface in at.gv.egovernment.moa.id.proxy"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="LoginParameterResolver.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-at.gv.egovernment.moa.id.proxy</FONT>
-<BR>
-Interface LoginParameterResolver</H2>
-<HR>
-<DL>
-<DT>public interface <B>LoginParameterResolver</B></DL>
-
-<P>
-Determines authentication parameters and headers to be added to a <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URLConnection.html" title="class or interface in java.net"><CODE>URLConnection</CODE></A>
- to the remote online application. 
- Utilizes <A HREF="../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy"><CODE>OAConfiguration</CODE></A> and <A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data"><CODE>AuthenticationData</CODE></A>.
-<P>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOABKZ">MOABKZ</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOABPK">MOABPK</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOADateOfBirth">MOADateOfBirth</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAFamilyName">MOAFamilyName</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAGivenName">MOAGivenName</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constants used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code>,
-  naming predicates used by the <code>LoginParameterResolver</code>.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAIdentificationValueType">MOAIdentificationValueType</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAIPAddress">MOAIPAddress</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAPublicAuthority">MOAPublicAuthority</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAQualifiedCertificate">MOAQualifiedCertificate</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAStammzahl">MOAStammzahl</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code></TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#configure(java.lang.String)">configure</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;configuration)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html" title="class or interface in java.util">Map</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#getAuthenticationHeaders(at.gv.egovernment.moa.id.config.proxy.OAConfiguration, at.gv.egovernment.moa.id.data.AuthenticationData, java.lang.String)">getAuthenticationHeaders</A></B>(<A HREF="../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>&nbsp;oaConf,
-                         <A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>&nbsp;authData,
-                         <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;clientIPAddress)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns authentication headers to be added to a URLConnection.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html" title="class or interface in java.util">Map</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#getAuthenticationParameters(at.gv.egovernment.moa.id.config.proxy.OAConfiguration, at.gv.egovernment.moa.id.data.AuthenticationData, java.lang.String)">getAuthenticationParameters</A></B>(<A HREF="../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>&nbsp;oaConf,
-                            <A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>&nbsp;authData,
-                            <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;clientIPAddress)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns request parameters to be added to a URLConnection.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="MOAGivenName"><!-- --></A><H3>
-MOAGivenName</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>MOAGivenName</B></PRE>
-<DL>
-<DD>Constants used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code>,
-  naming predicates used by the <code>LoginParameterResolver</code>.
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#at.gv.egovernment.moa.id.proxy.LoginParameterResolver.MOAGivenName">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="MOAFamilyName"><!-- --></A><H3>
-MOAFamilyName</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>MOAFamilyName</B></PRE>
-<DL>
-<DD>Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code>
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#at.gv.egovernment.moa.id.proxy.LoginParameterResolver.MOAFamilyName">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="MOADateOfBirth"><!-- --></A><H3>
-MOADateOfBirth</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>MOADateOfBirth</B></PRE>
-<DL>
-<DD>Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code>
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#at.gv.egovernment.moa.id.proxy.LoginParameterResolver.MOADateOfBirth">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="MOABPK"><!-- --></A><H3>
-MOABPK</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>MOABPK</B></PRE>
-<DL>
-<DD>Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code>
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#at.gv.egovernment.moa.id.proxy.LoginParameterResolver.MOABPK">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="MOAPublicAuthority"><!-- --></A><H3>
-MOAPublicAuthority</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>MOAPublicAuthority</B></PRE>
-<DL>
-<DD>Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code>
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#at.gv.egovernment.moa.id.proxy.LoginParameterResolver.MOAPublicAuthority">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="MOABKZ"><!-- --></A><H3>
-MOABKZ</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>MOABKZ</B></PRE>
-<DL>
-<DD>Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code>
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#at.gv.egovernment.moa.id.proxy.LoginParameterResolver.MOABKZ">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="MOAQualifiedCertificate"><!-- --></A><H3>
-MOAQualifiedCertificate</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>MOAQualifiedCertificate</B></PRE>
-<DL>
-<DD>Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code>
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#at.gv.egovernment.moa.id.proxy.LoginParameterResolver.MOAQualifiedCertificate">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="MOAStammzahl"><!-- --></A><H3>
-MOAStammzahl</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>MOAStammzahl</B></PRE>
-<DL>
-<DD>Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code>
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#at.gv.egovernment.moa.id.proxy.LoginParameterResolver.MOAStammzahl">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="MOAIdentificationValueType"><!-- --></A><H3>
-MOAIdentificationValueType</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>MOAIdentificationValueType</B></PRE>
-<DL>
-<DD>Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code>
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#at.gv.egovernment.moa.id.proxy.LoginParameterResolver.MOAIdentificationValueType">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="MOAIPAddress"><!-- --></A><H3>
-MOAIPAddress</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>MOAIPAddress</B></PRE>
-<DL>
-<DD>Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code>
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#at.gv.egovernment.moa.id.proxy.LoginParameterResolver.MOAIPAddress">Constant Field Values</A></DL>
-</DL>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getAuthenticationHeaders(at.gv.egovernment.moa.id.config.proxy.OAConfiguration, at.gv.egovernment.moa.id.data.AuthenticationData, java.lang.String)"><!-- --></A><H3>
-getAuthenticationHeaders</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html" title="class or interface in java.util">Map</A> <B>getAuthenticationHeaders</B>(<A HREF="../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>&nbsp;oaConf,
-                                    <A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>&nbsp;authData,
-                                    <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;clientIPAddress)
-                             throws <A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy">LoginParameterResolverException</A>,
-                                    <A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/NotAllowedException.html" title="class in at.gv.egovernment.moa.id.proxy">NotAllowedException</A></PRE>
-<DL>
-<DD>Returns authentication headers to be added to a URLConnection.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>oaConf</CODE> - configuration data<DD><CODE>authData</CODE> - authentication data<DD><CODE>clientIPAddress</CODE> - client IP address
-<DT><B>Returns:</B><DD>A map, the keys being header names and values being corresponding header values.
- <br>In case of authentication type <code>"basic-auth"</code>, header fields
- <code>username</code> and <code>password</code>.
- <br>In case of authentication type <code>"header-auth"</code>, header fields
- derived from parameter mapping and authentication data provided.
- <br>Otherwise, an empty map.
-<DT><B>Throws:</B>
-<DD><CODE><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy">LoginParameterResolverException</A></CODE>
-<DD><CODE><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/NotAllowedException.html" title="class in at.gv.egovernment.moa.id.proxy">NotAllowedException</A></CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getAuthenticationParameters(at.gv.egovernment.moa.id.config.proxy.OAConfiguration, at.gv.egovernment.moa.id.data.AuthenticationData, java.lang.String)"><!-- --></A><H3>
-getAuthenticationParameters</H3>
-<PRE>
-public <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html" title="class or interface in java.util">Map</A> <B>getAuthenticationParameters</B>(<A HREF="../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>&nbsp;oaConf,
-                                       <A HREF="../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>&nbsp;authData,
-                                       <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;clientIPAddress)
-                                throws <A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy">LoginParameterResolverException</A></PRE>
-<DL>
-<DD>Returns request parameters to be added to a URLConnection.
-<P>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>oaConf</CODE> - configuration data<DD><CODE>authData</CODE> - authentication data<DD><CODE>clientIPAddress</CODE> - client IP address
-<DT><B>Returns:</B><DD>A map, the keys being parameter names and values being corresponding parameter values.
- <br>In case of authentication type <code>"param-auth"</code>, parameters
- derived from parameter mapping and authentication data provided.
- <br>Otherwise, an empty map.
-<DT><B>Throws:</B>
-<DD><CODE><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy">LoginParameterResolverException</A></CODE></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="configure(java.lang.String)"><!-- --></A><H3>
-configure</H3>
-<PRE>
-public void <B>configure</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;configuration)
-               throws <A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy">LoginParameterResolverException</A>,
-                      <A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/NotAllowedException.html" title="class in at.gv.egovernment.moa.id.proxy">NotAllowedException</A></PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy">LoginParameterResolverException</A></CODE>
-<DD><CODE><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/NotAllowedException.html" title="class in at.gv.egovernment.moa.id.proxy">NotAllowedException</A></CODE></DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/LoginParameterResolver.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html" title="interface in at.gv.egovernment.moa.id.proxy"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="LoginParameterResolver.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html
deleted file mode 100644
index fd4dd84d2..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html
+++ /dev/null
@@ -1,251 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-LoginParameterResolverException (MOA ID API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="at.gv.egovernment.moa.id.proxy.LoginParameterResolverException class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="LoginParameterResolverException (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/LoginParameterResolverException.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/NotAllowedException.html" title="class in at.gv.egovernment.moa.id.proxy"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="LoginParameterResolverException.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Object">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-at.gv.egovernment.moa.id.proxy</FONT>
-<BR>
-Class LoginParameterResolverException</H2>
-<PRE>
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">java.lang.Object</A>
-  <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by">MOAIDException
-      <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><B>at.gv.egovernment.moa.id.proxy.LoginParameterResolverException</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>LoginParameterResolverException</B><DT>extends MOAIDException</DL>
-
-<P>
-Exception thrown while proxying a request to the online application
-<P>
-
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../serialized-form.html#at.gv.egovernment.moa.id.proxy.LoginParameterResolverException">Serialized Form</A></DL>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html#LoginParameterResolverException(java.lang.String, java.lang.Object[])">LoginParameterResolverException</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;messageId,
-                                <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">Object</A>[]&nbsp;parameters)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructor for LoginParameterResolverException.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html#LoginParameterResolverException(java.lang.String, java.lang.Object[], java.lang.Throwable)">LoginParameterResolverException</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;messageId,
-                                <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">Object</A>[]&nbsp;parameters,
-                                <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Throwable.html" title="class or interface in java.lang">Throwable</A>&nbsp;wrapped)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructor for LoginParameterResolverException.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">Object</A></B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#clone()" title="class or interface in java.lang">clone</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang">equals</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#finalize()" title="class or interface in java.lang">finalize</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#getClass()" title="class or interface in java.lang">getClass</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#hashCode()" title="class or interface in java.lang">hashCode</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#notify()" title="class or interface in java.lang">notify</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#notifyAll()" title="class or interface in java.lang">notifyAll</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#toString()" title="class or interface in java.lang">toString</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait()" title="class or interface in java.lang">wait</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait(long)" title="class or interface in java.lang">wait</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait(long, int)" title="class or interface in java.lang">wait</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="LoginParameterResolverException(java.lang.String, java.lang.Object[])"><!-- --></A><H3>
-LoginParameterResolverException</H3>
-<PRE>
-public <B>LoginParameterResolverException</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;messageId,
-                                       <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">Object</A>[]&nbsp;parameters)</PRE>
-<DL>
-<DD>Constructor for LoginParameterResolverException.
-<P>
-<DT><B>Parameters:</B><DD><CODE>messageId</CODE> - <DD><CODE>parameters</CODE> - </DL>
-<HR>
-
-<A NAME="LoginParameterResolverException(java.lang.String, java.lang.Object[], java.lang.Throwable)"><!-- --></A><H3>
-LoginParameterResolverException</H3>
-<PRE>
-public <B>LoginParameterResolverException</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;messageId,
-                                       <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">Object</A>[]&nbsp;parameters,
-                                       <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Throwable.html" title="class or interface in java.lang">Throwable</A>&nbsp;wrapped)</PRE>
-<DL>
-<DD>Constructor for LoginParameterResolverException.
-<P>
-<DT><B>Parameters:</B><DD><CODE>messageId</CODE> - <DD><CODE>parameters</CODE> - <DD><CODE>wrapped</CODE> - </DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/LoginParameterResolverException.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/NotAllowedException.html" title="class in at.gv.egovernment.moa.id.proxy"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="LoginParameterResolverException.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Object">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/NotAllowedException.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/NotAllowedException.html
deleted file mode 100644
index 7c01bd12f..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/NotAllowedException.html
+++ /dev/null
@@ -1,253 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-NotAllowedException (MOA ID API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="at.gv.egovernment.moa.id.proxy.NotAllowedException class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="NotAllowedException (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/NotAllowedException.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="NotAllowedException.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Object">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-at.gv.egovernment.moa.id.proxy</FONT>
-<BR>
-Class NotAllowedException</H2>
-<PRE>
-<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">java.lang.Object</A>
-  <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by">MOAIDException
-      <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><B>at.gv.egovernment.moa.id.proxy.NotAllowedException</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>NotAllowedException</B><DT>extends MOAIDException</DL>
-
-<P>
-Exception thrown while proxying a request to the online application
- Reason for this exception: the dedicated LoginParameterResolver does 
- not allow access to the desired ressource.
-<P>
-
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../serialized-form.html#at.gv.egovernment.moa.id.proxy.NotAllowedException">Serialized Form</A></DL>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/NotAllowedException.html#NotAllowedException(java.lang.String, java.lang.Object[])">NotAllowedException</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;messageId,
-                    <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">Object</A>[]&nbsp;parameters)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructor for NotAllowedException.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/NotAllowedException.html#NotAllowedException(java.lang.String, java.lang.Object[], java.lang.Throwable)">NotAllowedException</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;messageId,
-                    <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">Object</A>[]&nbsp;parameters,
-                    <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Throwable.html" title="class or interface in java.lang">Throwable</A>&nbsp;wrapped)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructor for NotAllowedException.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">Object</A></B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#clone()" title="class or interface in java.lang">clone</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang">equals</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#finalize()" title="class or interface in java.lang">finalize</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#getClass()" title="class or interface in java.lang">getClass</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#hashCode()" title="class or interface in java.lang">hashCode</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#notify()" title="class or interface in java.lang">notify</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#notifyAll()" title="class or interface in java.lang">notifyAll</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#toString()" title="class or interface in java.lang">toString</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait()" title="class or interface in java.lang">wait</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait(long)" title="class or interface in java.lang">wait</A>, <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html#wait(long, int)" title="class or interface in java.lang">wait</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="NotAllowedException(java.lang.String, java.lang.Object[])"><!-- --></A><H3>
-NotAllowedException</H3>
-<PRE>
-public <B>NotAllowedException</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;messageId,
-                           <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">Object</A>[]&nbsp;parameters)</PRE>
-<DL>
-<DD>Constructor for NotAllowedException.
-<P>
-<DT><B>Parameters:</B><DD><CODE>messageId</CODE> - <DD><CODE>parameters</CODE> - </DL>
-<HR>
-
-<A NAME="NotAllowedException(java.lang.String, java.lang.Object[], java.lang.Throwable)"><!-- --></A><H3>
-NotAllowedException</H3>
-<PRE>
-public <B>NotAllowedException</B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;messageId,
-                           <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang">Object</A>[]&nbsp;parameters,
-                           <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Throwable.html" title="class or interface in java.lang">Throwable</A>&nbsp;wrapped)</PRE>
-<DL>
-<DD>Constructor for NotAllowedException.
-<P>
-<DT><B>Parameters:</B><DD><CODE>messageId</CODE> - <DD><CODE>parameters</CODE> - <DD><CODE>wrapped</CODE> - </DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/NotAllowedException.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="NotAllowedException.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Object">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/ConnectionBuilder.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/ConnectionBuilder.html
deleted file mode 100644
index 69af13810..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/ConnectionBuilder.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:52 CET 2004 -->
-<TITLE>
-Uses of Interface at.gv.egovernment.moa.id.proxy.ConnectionBuilder (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Interface at.gv.egovernment.moa.id.proxy.ConnectionBuilder (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html" title="interface in at.gv.egovernment.moa.id.proxy"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ConnectionBuilder.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Interface<br>at.gv.egovernment.moa.id.proxy.ConnectionBuilder</B></H2>
-</CENTER>
-No usage of at.gv.egovernment.moa.id.proxy.ConnectionBuilder
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html" title="interface in at.gv.egovernment.moa.id.proxy"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ConnectionBuilder.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/LoginParameterResolver.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/LoginParameterResolver.html
deleted file mode 100644
index aca06fa02..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/LoginParameterResolver.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:52 CET 2004 -->
-<TITLE>
-Uses of Interface at.gv.egovernment.moa.id.proxy.LoginParameterResolver (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Interface at.gv.egovernment.moa.id.proxy.LoginParameterResolver (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="LoginParameterResolver.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Interface<br>at.gv.egovernment.moa.id.proxy.LoginParameterResolver</B></H2>
-</CENTER>
-No usage of at.gv.egovernment.moa.id.proxy.LoginParameterResolver
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="LoginParameterResolver.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/LoginParameterResolverException.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/LoginParameterResolverException.html
deleted file mode 100644
index ccd7d50cf..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/LoginParameterResolverException.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:52 CET 2004 -->
-<TITLE>
-Uses of Class at.gv.egovernment.moa.id.proxy.LoginParameterResolverException (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class at.gv.egovernment.moa.id.proxy.LoginParameterResolverException (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="LoginParameterResolverException.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>at.gv.egovernment.moa.id.proxy.LoginParameterResolverException</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy">LoginParameterResolverException</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#at.gv.egovernment.moa.id.proxy"><B>at.gv.egovernment.moa.id.proxy</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="at.gv.egovernment.moa.id.proxy"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy">LoginParameterResolverException</A> in <A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/package-summary.html">at.gv.egovernment.moa.id.proxy</A></FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/package-summary.html">at.gv.egovernment.moa.id.proxy</A> that throw <A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy">LoginParameterResolverException</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html" title="class or interface in java.util">Map</A></CODE></FONT></TD>
-<TD><CODE><B>LoginParameterResolver.</B><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#getAuthenticationHeaders(at.gv.egovernment.moa.id.config.proxy.OAConfiguration, at.gv.egovernment.moa.id.data.AuthenticationData, java.lang.String)">getAuthenticationHeaders</A></B>(<A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>&nbsp;oaConf,
-                         <A HREF="../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>&nbsp;authData,
-                         <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;clientIPAddress)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns authentication headers to be added to a URLConnection.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html" title="class or interface in java.util">Map</A></CODE></FONT></TD>
-<TD><CODE><B>LoginParameterResolver.</B><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#getAuthenticationParameters(at.gv.egovernment.moa.id.config.proxy.OAConfiguration, at.gv.egovernment.moa.id.data.AuthenticationData, java.lang.String)">getAuthenticationParameters</A></B>(<A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>&nbsp;oaConf,
-                            <A HREF="../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>&nbsp;authData,
-                            <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;clientIPAddress)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns request parameters to be added to a URLConnection.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>LoginParameterResolver.</B><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#configure(java.lang.String)">configure</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;configuration)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="LoginParameterResolverException.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/NotAllowedException.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/NotAllowedException.html
deleted file mode 100644
index fa0e1f24e..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/class-use/NotAllowedException.html
+++ /dev/null
@@ -1,182 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:52 CET 2004 -->
-<TITLE>
-Uses of Class at.gv.egovernment.moa.id.proxy.NotAllowedException (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class at.gv.egovernment.moa.id.proxy.NotAllowedException (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/NotAllowedException.html" title="class in at.gv.egovernment.moa.id.proxy"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="NotAllowedException.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>at.gv.egovernment.moa.id.proxy.NotAllowedException</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/NotAllowedException.html" title="class in at.gv.egovernment.moa.id.proxy">NotAllowedException</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#at.gv.egovernment.moa.id.proxy"><B>at.gv.egovernment.moa.id.proxy</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="at.gv.egovernment.moa.id.proxy"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/NotAllowedException.html" title="class in at.gv.egovernment.moa.id.proxy">NotAllowedException</A> in <A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/package-summary.html">at.gv.egovernment.moa.id.proxy</A></FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/package-summary.html">at.gv.egovernment.moa.id.proxy</A> that throw <A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/NotAllowedException.html" title="class in at.gv.egovernment.moa.id.proxy">NotAllowedException</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/util/Map.html" title="class or interface in java.util">Map</A></CODE></FONT></TD>
-<TD><CODE><B>LoginParameterResolver.</B><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#getAuthenticationHeaders(at.gv.egovernment.moa.id.config.proxy.OAConfiguration, at.gv.egovernment.moa.id.data.AuthenticationData, java.lang.String)">getAuthenticationHeaders</A></B>(<A HREF="../../../../../../../at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>&nbsp;oaConf,
-                         <A HREF="../../../../../../../at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>&nbsp;authData,
-                         <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;clientIPAddress)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns authentication headers to be added to a URLConnection.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>LoginParameterResolver.</B><B><A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#configure(java.lang.String)">configure</A></B>(<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;configuration)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../at/gv/egovernment/moa/id/proxy/NotAllowedException.html" title="class in at.gv.egovernment.moa.id.proxy"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="NotAllowedException.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-frame.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-frame.html
deleted file mode 100644
index a8afe874e..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-frame.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-at.gv.egovernment.moa.id.proxy (MOA ID API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="at.gv.egovernment.moa.id.proxy package">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/package-summary.html" target="classFrame">at.gv.egovernment.moa.id.proxy</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Interfaces</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="ConnectionBuilder.html" title="interface in at.gv.egovernment.moa.id.proxy" target="classFrame"><I>ConnectionBuilder</I></A>
-<BR>
-<A HREF="LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy" target="classFrame"><I>LoginParameterResolver</I></A></FONT></TD>
-</TR>
-</TABLE>
-
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy" target="classFrame">LoginParameterResolverException</A>
-<BR>
-<A HREF="NotAllowedException.html" title="class in at.gv.egovernment.moa.id.proxy" target="classFrame">NotAllowedException</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-summary.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-summary.html
deleted file mode 100644
index 9c6f09843..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-summary.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-at.gv.egovernment.moa.id.proxy (MOA ID API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="at.gv.egovernment.moa.id.proxy package">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="at.gv.egovernment.moa.id.proxy (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/data/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;NEXT PACKAGE</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package at.gv.egovernment.moa.id.proxy
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Interface Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html" title="interface in at.gv.egovernment.moa.id.proxy">ConnectionBuilder</A></B></TD>
-<TD>Builder for <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URLConnection.html" title="class or interface in java.net"><CODE>URLConnection</CODE></A> objects used to forward requests
- to the remote online application.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy">LoginParameterResolver</A></B></TD>
-<TD>Determines authentication parameters and headers to be added to a <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URLConnection.html" title="class or interface in java.net"><CODE>URLConnection</CODE></A>
- to the remote online application. 
- </TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy">LoginParameterResolverException</A></B></TD>
-<TD>Exception thrown while proxying a request to the online application</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/NotAllowedException.html" title="class in at.gv.egovernment.moa.id.proxy">NotAllowedException</A></B></TD>
-<TD>Exception thrown while proxying a request to the online application
- Reason for this exception: the dedicated LoginParameterResolver does 
- not allow access to the desired ressource.</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/data/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;NEXT PACKAGE</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-tree.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-tree.html
deleted file mode 100644
index 90e057ebc..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-tree.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-at.gv.egovernment.moa.id.proxy Class Hierarchy (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="at.gv.egovernment.moa.id.proxy Class Hierarchy (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/data/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package at.gv.egovernment.moa.id.proxy
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">class java.lang.<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang"><B>Object</B></A><UL>
-<LI TYPE="circle">class MOAIDException<UL>
-<LI TYPE="circle">class at.gv.egovernment.moa.id.proxy.<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/NotAllowedException.html" title="class in at.gv.egovernment.moa.id.proxy"><B>NotAllowedException</B></A></UL>
-<LI TYPE="circle">class MOAIDException<UL>
-<LI TYPE="circle">class at.gv.egovernment.moa.id.proxy.<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy"><B>LoginParameterResolverException</B></A></UL>
-</UL>
-</UL>
-<H2>
-Interface Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">interface at.gv.egovernment.moa.id.proxy.<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html" title="interface in at.gv.egovernment.moa.id.proxy"><B>ConnectionBuilder</B></A><LI TYPE="circle">interface at.gv.egovernment.moa.id.proxy.<A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy"><B>LoginParameterResolver</B></A></UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../at/gv/egovernment/moa/id/data/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-use.html b/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-use.html
deleted file mode 100644
index a8c6c026b..000000000
--- a/id/server/doc/moa_id/api-doc/at/gv/egovernment/moa/id/proxy/package-use.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:52 CET 2004 -->
-<TITLE>
-Uses of Package at.gv.egovernment.moa.id.proxy (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Package at.gv.egovernment.moa.id.proxy (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-use.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Package<br>at.gv.egovernment.moa.id.proxy</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/package-summary.html">at.gv.egovernment.moa.id.proxy</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#at.gv.egovernment.moa.id.proxy"><B>at.gv.egovernment.moa.id.proxy</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="at.gv.egovernment.moa.id.proxy"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Classes in <A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/package-summary.html">at.gv.egovernment.moa.id.proxy</A> used by <A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/package-summary.html">at.gv.egovernment.moa.id.proxy</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/class-use/LoginParameterResolverException.html#at.gv.egovernment.moa.id.proxy"><B>LoginParameterResolverException</B></A></B>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Exception thrown while proxying a request to the online application</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../at/gv/egovernment/moa/id/proxy/class-use/NotAllowedException.html#at.gv.egovernment.moa.id.proxy"><B>NotAllowedException</B></A></B>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Exception thrown while proxying a request to the online application
- Reason for this exception: the dedicated LoginParameterResolver does 
- not allow access to the desired ressource.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-use.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/constant-values.html b/id/server/doc/moa_id/api-doc/constant-values.html
deleted file mode 100644
index bc145c359..000000000
--- a/id/server/doc/moa_id/api-doc/constant-values.html
+++ /dev/null
@@ -1,262 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:52 CET 2004 -->
-<TITLE>
-Constant Field Values (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Constant Field Values (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="constant-values.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H1>
-Constant Field Values</H1>
-</CENTER>
-<HR SIZE="4" NOSHADE>
-<B>Contents</B><UL>
-<LI><A HREF="#at.gv">at.gv.*</A>
-</UL>
-
-<A NAME="at.gv"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD ALIGN="left"><FONT SIZE="+2">
-<B>at.gv.*</B></FONT></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="0" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=3><B>at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A></B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="at.gv.egovernment.moa.id.config.proxy.OAConfiguration.BASIC_AUTH"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#BASIC_AUTH">BASIC_AUTH</A></CODE></TD>
-<TD ALIGN="right"><CODE>"basic"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="at.gv.egovernment.moa.id.config.proxy.OAConfiguration.HEADER_AUTH"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#HEADER_AUTH">HEADER_AUTH</A></CODE></TD>
-<TD ALIGN="right"><CODE>"header"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="at.gv.egovernment.moa.id.config.proxy.OAConfiguration.LOGINTYPE_STATEFUL"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#LOGINTYPE_STATEFUL">LOGINTYPE_STATEFUL</A></CODE></TD>
-<TD ALIGN="right"><CODE>"stateful"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="at.gv.egovernment.moa.id.config.proxy.OAConfiguration.LOGINTYPE_STATELESS"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#LOGINTYPE_STATELESS">LOGINTYPE_STATELESS</A></CODE></TD>
-<TD ALIGN="right"><CODE>"stateless"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="at.gv.egovernment.moa.id.config.proxy.OAConfiguration.PARAM_AUTH"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#PARAM_AUTH">PARAM_AUTH</A></CODE></TD>
-<TD ALIGN="right"><CODE>"param"</CODE></TD>
-</TR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<P>
-
-<TABLE BORDER="0" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=3><B>at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy">LoginParameterResolver</A></B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="at.gv.egovernment.moa.id.proxy.LoginParameterResolver.MOABKZ"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOABKZ">MOABKZ</A></CODE></TD>
-<TD ALIGN="right"><CODE>"MOABKZ"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="at.gv.egovernment.moa.id.proxy.LoginParameterResolver.MOABPK"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOABPK">MOABPK</A></CODE></TD>
-<TD ALIGN="right"><CODE>"MOABPK"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="at.gv.egovernment.moa.id.proxy.LoginParameterResolver.MOADateOfBirth"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOADateOfBirth">MOADateOfBirth</A></CODE></TD>
-<TD ALIGN="right"><CODE>"MOADateOfBirth"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="at.gv.egovernment.moa.id.proxy.LoginParameterResolver.MOAFamilyName"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAFamilyName">MOAFamilyName</A></CODE></TD>
-<TD ALIGN="right"><CODE>"MOAFamilyName"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="at.gv.egovernment.moa.id.proxy.LoginParameterResolver.MOAGivenName"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAGivenName">MOAGivenName</A></CODE></TD>
-<TD ALIGN="right"><CODE>"MOAGivenName"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="at.gv.egovernment.moa.id.proxy.LoginParameterResolver.MOAIdentificationValueType"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAIdentificationValueType">MOAIdentificationValueType</A></CODE></TD>
-<TD ALIGN="right"><CODE>"MOAIdentificationValueType"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="at.gv.egovernment.moa.id.proxy.LoginParameterResolver.MOAIPAddress"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAIPAddress">MOAIPAddress</A></CODE></TD>
-<TD ALIGN="right"><CODE>"MOAIPAddress"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="at.gv.egovernment.moa.id.proxy.LoginParameterResolver.MOAPublicAuthority"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAPublicAuthority">MOAPublicAuthority</A></CODE></TD>
-<TD ALIGN="right"><CODE>"MOAPublicAuthority"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="at.gv.egovernment.moa.id.proxy.LoginParameterResolver.MOAQualifiedCertificate"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAQualifiedCertificate">MOAQualifiedCertificate</A></CODE></TD>
-<TD ALIGN="right"><CODE>"MOAQualifiedCertificate"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="at.gv.egovernment.moa.id.proxy.LoginParameterResolver.MOAStammzahl"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAStammzahl">MOAStammzahl</A></CODE></TD>
-<TD ALIGN="right"><CODE>"MOAStammzahl"</CODE></TD>
-</TR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="constant-values.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/deprecated-list.html b/id/server/doc/moa_id/api-doc/deprecated-list.html
deleted file mode 100644
index d760f28ee..000000000
--- a/id/server/doc/moa_id/api-doc/deprecated-list.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:52 CET 2004 -->
-<TITLE>
-Deprecated List (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Deprecated List (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Deprecated</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="deprecated-list.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Deprecated API</B></H2>
-</CENTER>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Deprecated</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="deprecated-list.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/help-doc.html b/id/server/doc/moa_id/api-doc/help-doc.html
deleted file mode 100644
index bbdccd6b5..000000000
--- a/id/server/doc/moa_id/api-doc/help-doc.html
+++ /dev/null
@@ -1,193 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-API Help (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="API Help (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Help</B></FONT>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="help-doc.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H1>
-How This API Document Is Organized</H1>
-</CENTER>
-This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.<H3>
-Overview</H3>
-<BLOCKQUOTE>
-
-<P>
-The <A HREF="overview-summary.html">Overview</A> page is the front page of this API document and provides a list of all packages with a summary for each.  This page can also contain an overall description of the set of packages.</BLOCKQUOTE>
-<H3>
-Package</H3>
-<BLOCKQUOTE>
-
-<P>
-Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain four categories:<UL>
-<LI>Interfaces (italic)<LI>Classes<LI>Exceptions<LI>Errors</UL>
-</BLOCKQUOTE>
-<H3>
-Class/Interface</H3>
-<BLOCKQUOTE>
-
-<P>
-Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:<UL>
-<LI>Class inheritance diagram<LI>Direct Subclasses<LI>All Known Subinterfaces<LI>All Known Implementing Classes<LI>Class/interface declaration<LI>Class/interface description
-<P>
-<LI>Nested Class Summary<LI>Field Summary<LI>Constructor Summary<LI>Method Summary
-<P>
-<LI>Field Detail<LI>Constructor Detail<LI>Method Detail</UL>
-Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.</BLOCKQUOTE>
-<H3>
-Use</H3>
-<BLOCKQUOTE>
-Each documented package, class and interface has its own Use page.  This page describes what packages, classes, methods, constructors and fields use any part of the given class or package. Given a class or interface A, its Use page includes subclasses of A, fields declared as A, methods that return A, and methods and constructors with parameters of type A.  You can access this page by first going to the package, class or interface, then clicking on the "Use" link in the navigation bar.</BLOCKQUOTE>
-<H3>
-Tree (Class Hierarchy)</H3>
-<BLOCKQUOTE>
-There is a <A HREF="overview-tree.html">Class Hierarchy</A> page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with <code>java.lang.Object</code>. The interfaces do not inherit from <code>java.lang.Object</code>.<UL>
-<LI>When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.<LI>When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.</UL>
-</BLOCKQUOTE>
-<H3>
-Deprecated API</H3>
-<BLOCKQUOTE>
-The <A HREF="deprecated-list.html">Deprecated API</A> page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.</BLOCKQUOTE>
-<H3>
-Index</H3>
-<BLOCKQUOTE>
-The <A HREF="index-all.html">Index</A> contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.</BLOCKQUOTE>
-<H3>
-Prev/Next</H3>
-These links take you to the next or previous class, interface, package, or related page.<H3>
-Frames/No Frames</H3>
-These links show and hide the HTML frames.  All pages are available with or without frames.
-<P>
-<H3>
-Serialized Form</H3>
-Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.
-<P>
-<FONT SIZE="-1">
-<EM>
-This help file applies to API documentation generated using the standard doclet.</EM>
-</FONT>
-<BR>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Help</B></FONT>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="help-doc.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/index-all.html b/id/server/doc/moa_id/api-doc/index-all.html
deleted file mode 100644
index b6ccf5c68..000000000
--- a/id/server/doc/moa_id/api-doc/index-all.html
+++ /dev/null
@@ -1,462 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:52 CET 2004 -->
-<TITLE>
-Index (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Index (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-all.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="#_A_">A</A> <A HREF="#_B_">B</A> <A HREF="#_C_">C</A> <A HREF="#_D_">D</A> <A HREF="#_G_">G</A> <A HREF="#_H_">H</A> <A HREF="#_I_">I</A> <A HREF="#_L_">L</A> <A HREF="#_M_">M</A> <A HREF="#_N_">N</A> <A HREF="#_O_">O</A> <A HREF="#_P_">P</A> <A HREF="#_S_">S</A> <A HREF="#_V_">V</A> <HR>
-<A NAME="_A_"><!-- --></A><H2>
-<B>A</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data"><B>AuthenticationData</B></A> - class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>.<DD>Encapsulates authentication data contained in a <code>&lt;saml:Assertion&gt;</code>.<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#AuthenticationData()"><B>AuthenticationData()</B></A> - 
-Constructor for class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Constructor for AuthenticationData.
-<DT><A HREF="at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id"><B>AuthenticationException</B></A> - class at.gv.egovernment.moa.id.<A HREF="at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id">AuthenticationException</A>.<DD>Exception thrown during handling of AuthenticationSession<DT><A HREF="at/gv/egovernment/moa/id/AuthenticationException.html#AuthenticationException(java.lang.String, java.lang.Object[])"><B>AuthenticationException(String, Object[])</B></A> - 
-Constructor for class at.gv.egovernment.moa.id.<A HREF="at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id">AuthenticationException</A>
-<DD>Constructor for AuthenticationException.
-<DT><A HREF="at/gv/egovernment/moa/id/AuthenticationException.html#AuthenticationException(java.lang.String, java.lang.Object[], java.lang.Throwable)"><B>AuthenticationException(String, Object[], Throwable)</B></A> - 
-Constructor for class at.gv.egovernment.moa.id.<A HREF="at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id">AuthenticationException</A>
-<DD>Constructor for AuthenticationException.
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth"><B>AuthenticationServer</B></A> - class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth">AuthenticationServer</A>.<DD>API for MOA ID Authentication Service.<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#AuthenticationServer()"><B>AuthenticationServer()</B></A> - 
-Constructor for class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth">AuthenticationServer</A>
-<DD>Constructor for AuthenticationServer.
-<DT><A HREF="at/gv/egovernment/moa/id/package-summary.html"><B>at.gv.egovernment.moa.id</B></A> - package at.gv.egovernment.moa.id<DD>&nbsp;<DT><A HREF="at/gv/egovernment/moa/id/auth/package-summary.html"><B>at.gv.egovernment.moa.id.auth</B></A> - package at.gv.egovernment.moa.id.auth<DD>&nbsp;<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/package-summary.html"><B>at.gv.egovernment.moa.id.config.proxy</B></A> - package at.gv.egovernment.moa.id.config.proxy<DD>&nbsp;<DT><A HREF="at/gv/egovernment/moa/id/data/package-summary.html"><B>at.gv.egovernment.moa.id.data</B></A> - package at.gv.egovernment.moa.id.data<DD>&nbsp;<DT><A HREF="at/gv/egovernment/moa/id/proxy/package-summary.html"><B>at.gv.egovernment.moa.id.proxy</B></A> - package at.gv.egovernment.moa.id.proxy<DD>&nbsp;</DL>
-<HR>
-<A NAME="_B_"><!-- --></A><H2>
-<B>B</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#BASIC_AUTH"><B>BASIC_AUTH</B></A> - 
-Static variable in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>
-<DD>Constant for an auth method
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html#buildConnection(javax.servlet.http.HttpServletRequest, java.lang.String, java.lang.String, javax.net.ssl.SSLSocketFactory, java.util.Map)"><B>buildConnection(HttpServletRequest, String, String, SSLSocketFactory, Map)</B></A> - 
-Method in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html" title="interface in at.gv.egovernment.moa.id.proxy">ConnectionBuilder</A>
-<DD>Builds an HttpURLConnection to a <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URL.html" title="class or interface in java.net"><CODE>URL</CODE></A> which is derived
- from an <CODE>HttpServletRequest</CODE> URL, by substitution of a 
- public URL prefix for the real URL prefix.
-</DL>
-<HR>
-<A NAME="_C_"><!-- --></A><H2>
-<B>C</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html" title="interface in at.gv.egovernment.moa.id.proxy"><B>ConnectionBuilder</B></A> - interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html" title="interface in at.gv.egovernment.moa.id.proxy">ConnectionBuilder</A>.<DD>Builder for <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URLConnection.html" title="class or interface in java.net"><CODE>URLConnection</CODE></A> objects used to forward requests
- to the remote online application.<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#cleanup()"><B>cleanup()</B></A> - 
-Method in class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth">AuthenticationServer</A>
-<DD>Cleans up expired session and authentication data stores.
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#configure(java.lang.String)"><B>configure(String)</B></A> - 
-Method in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy">LoginParameterResolver</A>
-<DD>&nbsp;
-</DL>
-<HR>
-<A NAME="_D_"><!-- --></A><H2>
-<B>D</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#debugOutputXMLFile(java.lang.String, org.w3c.dom.Element)"><B>debugOutputXMLFile(String, Element)</B></A> - 
-Static method in class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth">AuthenticationServer</A>
-<DD>Writes an XML structure to file for debugging purposes, encoding UTF-8.
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#debugOutputXMLFile(java.lang.String, java.lang.String)"><B>debugOutputXMLFile(String, String)</B></A> - 
-Static method in class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth">AuthenticationServer</A>
-<DD>Writes an XML structure to file for debugging purposes, encoding UTF-8.
-</DL>
-<HR>
-<A NAME="_G_"><!-- --></A><H2>
-<B>G</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getAssertionID()"><B>getAssertionID()</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Returns the assertionID.
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#getAuthType()"><B>getAuthType()</B></A> - 
-Method in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>
-<DD>Returns the authType.
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#getAuthenticationData(java.lang.String)"><B>getAuthenticationData(String)</B></A> - 
-Method in class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth">AuthenticationServer</A>
-<DD>Retrieves <code>AuthenticationData</code> indexed by the SAML artifact.
- 
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#getAuthenticationHeaders(at.gv.egovernment.moa.id.config.proxy.OAConfiguration, at.gv.egovernment.moa.id.data.AuthenticationData, java.lang.String)"><B>getAuthenticationHeaders(OAConfiguration, AuthenticationData, String)</B></A> - 
-Method in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy">LoginParameterResolver</A>
-<DD>Returns authentication headers to be added to a URLConnection.
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#getAuthenticationParameters(at.gv.egovernment.moa.id.config.proxy.OAConfiguration, at.gv.egovernment.moa.id.data.AuthenticationData, java.lang.String)"><B>getAuthenticationParameters(OAConfiguration, AuthenticationData, String)</B></A> - 
-Method in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy">LoginParameterResolver</A>
-<DD>Returns request parameters to be added to a URLConnection.
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#getBasicAuthPasswordMapping()"><B>getBasicAuthPasswordMapping()</B></A> - 
-Method in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>
-<DD>Returns the basicAuthPasswordMapping.
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#getBasicAuthUserIDMapping()"><B>getBasicAuthUserIDMapping()</B></A> - 
-Method in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>
-<DD>Returns the basicAuthUserIDMapping.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getDateOfBirth()"><B>getDateOfBirth()</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Returns the dateOfBirth.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getFamilyName()"><B>getFamilyName()</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Returns the familyName.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getGivenName()"><B>getGivenName()</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Returns the givenName.
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#getHeaderAuthMapping()"><B>getHeaderAuthMapping()</B></A> - 
-Method in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>
-<DD>Returns the headerAuthMapping.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getIdentificationType()"><B>getIdentificationType()</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Returns the identificationType
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getIdentificationValue()"><B>getIdentificationValue()</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Returns the identificationValue.
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#getInstance()"><B>getInstance()</B></A> - 
-Static method in class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth">AuthenticationServer</A>
-<DD>Returns the single instance of <code>AuthenticationServer</code>.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getIssueInstant()"><B>getIssueInstant()</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Returns the issueInstant.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getIssuer()"><B>getIssuer()</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Returns the issuer.
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#getLoginType()"><B>getLoginType()</B></A> - 
-Method in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>
-<DD>Returns the loginType.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getMajorVersion()"><B>getMajorVersion()</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Returns the majorVersion.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getMinorVersion()"><B>getMinorVersion()</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Returns the minorVersion.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getPBK()"><B>getPBK()</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Returns the bPK.
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#getParamAuthMapping()"><B>getParamAuthMapping()</B></A> - 
-Method in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>
-<DD>Returns the paramAuthMapping.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getPublicAuthorityCode()"><B>getPublicAuthorityCode()</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Returns the publicAuthorityCode.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getSamlAssertion()"><B>getSamlAssertion()</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Returns the samlAssertion.
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#getSession(java.lang.String)"><B>getSession(String)</B></A> - 
-Static method in class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth">AuthenticationServer</A>
-<DD>Retrieves a session from the session store.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#getTimestamp()"><B>getTimestamp()</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Returns the timestamp.
-</DL>
-<HR>
-<A NAME="_H_"><!-- --></A><H2>
-<B>H</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#HEADER_AUTH"><B>HEADER_AUTH</B></A> - 
-Static variable in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>
-<DD>Constant for an auth method
-</DL>
-<HR>
-<A NAME="_I_"><!-- --></A><H2>
-<B>I</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#isPublicAuthority()"><B>isPublicAuthority()</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Returns the publicAuthority.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#isQualifiedCertificate()"><B>isQualifiedCertificate()</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Returns the qualifiedCertificate.
-</DL>
-<HR>
-<A NAME="_L_"><!-- --></A><H2>
-<B>L</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#LOGINTYPE_STATEFUL"><B>LOGINTYPE_STATEFUL</B></A> - 
-Static variable in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>
-<DD>Constant for an login method
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#LOGINTYPE_STATELESS"><B>LOGINTYPE_STATELESS</B></A> - 
-Static variable in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>
-<DD>Constant for an login method
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy"><B>LoginParameterResolver</B></A> - interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy">LoginParameterResolver</A>.<DD>Determines authentication parameters and headers to be added to a <A HREF="http://java.sun.com/j2se/1.3/docs/api/java/net/URLConnection.html" title="class or interface in java.net"><CODE>URLConnection</CODE></A>
- to the remote online application. 
- <DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy"><B>LoginParameterResolverException</B></A> - class at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy">LoginParameterResolverException</A>.<DD>Exception thrown while proxying a request to the online application<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html#LoginParameterResolverException(java.lang.String, java.lang.Object[])"><B>LoginParameterResolverException(String, Object[])</B></A> - 
-Constructor for class at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy">LoginParameterResolverException</A>
-<DD>Constructor for LoginParameterResolverException.
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html#LoginParameterResolverException(java.lang.String, java.lang.Object[], java.lang.Throwable)"><B>LoginParameterResolverException(String, Object[], Throwable)</B></A> - 
-Constructor for class at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy">LoginParameterResolverException</A>
-<DD>Constructor for LoginParameterResolverException.
-</DL>
-<HR>
-<A NAME="_M_"><!-- --></A><H2>
-<B>M</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOABKZ"><B>MOABKZ</B></A> - 
-Static variable in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy">LoginParameterResolver</A>
-<DD>Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code>
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOABPK"><B>MOABPK</B></A> - 
-Static variable in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy">LoginParameterResolver</A>
-<DD>Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code>
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOADateOfBirth"><B>MOADateOfBirth</B></A> - 
-Static variable in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy">LoginParameterResolver</A>
-<DD>Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code>
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAFamilyName"><B>MOAFamilyName</B></A> - 
-Static variable in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy">LoginParameterResolver</A>
-<DD>Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code>
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAGivenName"><B>MOAGivenName</B></A> - 
-Static variable in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy">LoginParameterResolver</A>
-<DD>Constants used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code>,
-  naming predicates used by the <code>LoginParameterResolver</code>.
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAIPAddress"><B>MOAIPAddress</B></A> - 
-Static variable in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy">LoginParameterResolver</A>
-<DD>Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code>
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAIdentificationValueType"><B>MOAIdentificationValueType</B></A> - 
-Static variable in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy">LoginParameterResolver</A>
-<DD>Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code>
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAPublicAuthority"><B>MOAPublicAuthority</B></A> - 
-Static variable in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy">LoginParameterResolver</A>
-<DD>Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code>
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAQualifiedCertificate"><B>MOAQualifiedCertificate</B></A> - 
-Static variable in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy">LoginParameterResolver</A>
-<DD>Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code>
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html#MOAStammzahl"><B>MOAStammzahl</B></A> - 
-Static variable in interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy">LoginParameterResolver</A>
-<DD>Constant used in <code>MOAIDConfiguration-1.2.xsd</code>, type <code>MOAAuthDataType</code>
-</DL>
-<HR>
-<A NAME="_N_"><!-- --></A><H2>
-<B>N</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/NotAllowedException.html" title="class in at.gv.egovernment.moa.id.proxy"><B>NotAllowedException</B></A> - class at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/NotAllowedException.html" title="class in at.gv.egovernment.moa.id.proxy">NotAllowedException</A>.<DD>Exception thrown while proxying a request to the online application
- Reason for this exception: the dedicated LoginParameterResolver does 
- not allow access to the desired ressource.<DT><A HREF="at/gv/egovernment/moa/id/proxy/NotAllowedException.html#NotAllowedException(java.lang.String, java.lang.Object[])"><B>NotAllowedException(String, Object[])</B></A> - 
-Constructor for class at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/NotAllowedException.html" title="class in at.gv.egovernment.moa.id.proxy">NotAllowedException</A>
-<DD>Constructor for NotAllowedException.
-<DT><A HREF="at/gv/egovernment/moa/id/proxy/NotAllowedException.html#NotAllowedException(java.lang.String, java.lang.Object[], java.lang.Throwable)"><B>NotAllowedException(String, Object[], Throwable)</B></A> - 
-Constructor for class at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/NotAllowedException.html" title="class in at.gv.egovernment.moa.id.proxy">NotAllowedException</A>
-<DD>Constructor for NotAllowedException.
-</DL>
-<HR>
-<A NAME="_O_"><!-- --></A><H2>
-<B>O</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy"><B>OAConfiguration</B></A> - class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>.<DD>Holds configuration data concerning an online application for use by the MOA-ID Proxy component.
- <DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#OAConfiguration()"><B>OAConfiguration()</B></A> - 
-Constructor for class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>
-<DD>&nbsp;
-</DL>
-<HR>
-<A NAME="_P_"><!-- --></A><H2>
-<B>P</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#PARAM_AUTH"><B>PARAM_AUTH</B></A> - 
-Static variable in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>
-<DD>Constant for an auth method
-</DL>
-<HR>
-<A NAME="_S_"><!-- --></A><H2>
-<B>S</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#selectBKU(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)"><B>selectBKU(String, String, String, String, String)</B></A> - 
-Method in class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth">AuthenticationServer</A>
-<DD>Processes request to select a BKU.
- 
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setAssertionID(java.lang.String)"><B>setAssertionID(String)</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Sets the assertionID.
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#setAuthType(java.lang.String)"><B>setAuthType(String)</B></A> - 
-Method in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>
-<DD>Sets the authType.
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#setBasicAuthPasswordMapping(java.lang.String)"><B>setBasicAuthPasswordMapping(String)</B></A> - 
-Method in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>
-<DD>Sets the basicAuthPasswordMapping.
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#setBasicAuthUserIDMapping(java.lang.String)"><B>setBasicAuthUserIDMapping(String)</B></A> - 
-Method in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>
-<DD>Sets the basicAuthUserIDMapping.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setDateOfBirth(java.lang.String)"><B>setDateOfBirth(String)</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Sets the dateOfBirth.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setFamilyName(java.lang.String)"><B>setFamilyName(String)</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Sets the familyName.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setGivenName(java.lang.String)"><B>setGivenName(String)</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Sets the givenName.
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#setHeaderAuthMapping(java.util.HashMap)"><B>setHeaderAuthMapping(HashMap)</B></A> - 
-Method in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>
-<DD>Sets the headerAuthMapping.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setIdentificationType(java.lang.String)"><B>setIdentificationType(String)</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Sets the identificationType.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setIdentificationValue(java.lang.String)"><B>setIdentificationValue(String)</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Sets the identificationValue.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setIssueInstant(java.lang.String)"><B>setIssueInstant(String)</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Sets the issueInstant.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setIssuer(java.lang.String)"><B>setIssuer(String)</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Sets the issuer.
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#setLoginType(java.lang.String)"><B>setLoginType(String)</B></A> - 
-Method in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>
-<DD>Sets the loginType.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setMajorVersion(int)"><B>setMajorVersion(int)</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Sets the majorVersion.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setMinorVersion(int)"><B>setMinorVersion(int)</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Sets the minorVersion.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setPBK(java.lang.String)"><B>setPBK(String)</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Sets the bPK.
-<DT><A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html#setParamAuthMapping(java.util.HashMap)"><B>setParamAuthMapping(HashMap)</B></A> - 
-Method in class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy">OAConfiguration</A>
-<DD>Sets the paramAuthMapping.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setPublicAuthority(boolean)"><B>setPublicAuthority(boolean)</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Sets the publicAuthority.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setPublicAuthorityCode(java.lang.String)"><B>setPublicAuthorityCode(String)</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Sets the publicAuthorityCode.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setQualifiedCertificate(boolean)"><B>setQualifiedCertificate(boolean)</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Sets the qualifiedCertificate.
-<DT><A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html#setSamlAssertion(java.lang.String)"><B>setSamlAssertion(String)</B></A> - 
-Method in class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data">AuthenticationData</A>
-<DD>Sets the samlAssertion.
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#setSecondsAuthDataTimeOut(long)"><B>setSecondsAuthDataTimeOut(long)</B></A> - 
-Method in class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth">AuthenticationServer</A>
-<DD>Sets the authDataTimeOut.
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#setSecondsSessionTimeOut(long)"><B>setSecondsSessionTimeOut(long)</B></A> - 
-Method in class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth">AuthenticationServer</A>
-<DD>Sets the sessionTimeOut.
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#startAuthentication(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)"><B>startAuthentication(String, String, String, String, String, String)</B></A> - 
-Method in class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth">AuthenticationServer</A>
-<DD>Processes the beginning of an authentication session.
- 
-</DL>
-<HR>
-<A NAME="_V_"><!-- --></A><H2>
-<B>V</B></H2>
-<DL>
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#verifyAuthenticationBlock(java.lang.String, java.lang.String)"><B>verifyAuthenticationBlock(String, String)</B></A> - 
-Method in class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth">AuthenticationServer</A>
-<DD>Processes a <code>&lt;CreateXMLSignatureResponse&gt;</code> sent by the
- security layer implementation.
-<DT><A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html#verifyIdentityLink(java.lang.String, java.lang.String)"><B>verifyIdentityLink(String, String)</B></A> - 
-Method in class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth">AuthenticationServer</A>
-<DD>Processes an <code>&lt;InfoboxReadResponse&gt;</code> sent by the 
- security layer implementation.
-</DL>
-<HR>
-<A HREF="#_A_">A</A> <A HREF="#_B_">B</A> <A HREF="#_C_">C</A> <A HREF="#_D_">D</A> <A HREF="#_G_">G</A> <A HREF="#_H_">H</A> <A HREF="#_I_">I</A> <A HREF="#_L_">L</A> <A HREF="#_M_">M</A> <A HREF="#_N_">N</A> <A HREF="#_O_">O</A> <A HREF="#_P_">P</A> <A HREF="#_S_">S</A> <A HREF="#_V_">V</A> 
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-all.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/index.html b/id/server/doc/moa_id/api-doc/index.html
deleted file mode 100644
index 61c644160..000000000
--- a/id/server/doc/moa_id/api-doc/index.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Mon Mar 15 15:50:53 CET 2004-->
-<TITLE>
-MOA ID API
-</TITLE>
-</HEAD>
-<FRAMESET cols="20%,80%">
-<FRAMESET rows="30%,70%">
-<FRAME src="overview-frame.html" name="packageListFrame" title="All Packages">
-<FRAME src="allclasses-frame.html" name="packageFrame" title="All classes and interfaces (except non-static nested types)">
-</FRAMESET>
-<FRAME src="overview-summary.html" name="classFrame" title="Package, class and interface descriptions">
-<NOFRAMES>
-<H2>
-Frame Alert</H2>
-
-<P>
-This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
-<BR>
-Link to<A HREF="overview-summary.html">Non-frame version.</A>
-</NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/overview-frame.html b/id/server/doc/moa_id/api-doc/overview-frame.html
deleted file mode 100644
index 58e79621c..000000000
--- a/id/server/doc/moa_id/api-doc/overview-frame.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-Overview (MOA ID API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="Overview, <h1>MOA ID API</h1>">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameTitleFont">
-<B></B></FONT></TD>
-</TR>
-</TABLE>
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="allclasses-frame.html" target="packageFrame">All Classes</A></FONT>
-<P>
-<FONT size="+1" CLASS="FrameHeadingFont">
-Packages</FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="at/gv/egovernment/moa/id/package-frame.html" target="packageFrame">at.gv.egovernment.moa.id</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="at/gv/egovernment/moa/id/auth/package-frame.html" target="packageFrame">at.gv.egovernment.moa.id.auth</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="at/gv/egovernment/moa/id/config/proxy/package-frame.html" target="packageFrame">at.gv.egovernment.moa.id.config.proxy</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="at/gv/egovernment/moa/id/data/package-frame.html" target="packageFrame">at.gv.egovernment.moa.id.data</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="at/gv/egovernment/moa/id/proxy/package-frame.html" target="packageFrame">at.gv.egovernment.moa.id.proxy</A></FONT>
-<BR>
-</TD>
-</TR>
-</TABLE>
-
-<P>
-&nbsp;
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/overview-summary.html b/id/server/doc/moa_id/api-doc/overview-summary.html
deleted file mode 100644
index 0d16ca82c..000000000
--- a/id/server/doc/moa_id/api-doc/overview-summary.html
+++ /dev/null
@@ -1,165 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-Overview (MOA ID API)
-</TITLE>
-
-<META NAME="keywords" CONTENT="Overview, <h1>MOA ID API</h1>">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Overview (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Overview</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="overview-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H1>
-<h1>MOA ID API</h1>
-</H1>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Packages</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="at/gv/egovernment/moa/id/package-summary.html">at.gv.egovernment.moa.id</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="at/gv/egovernment/moa/id/auth/package-summary.html">at.gv.egovernment.moa.id.auth</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="at/gv/egovernment/moa/id/config/proxy/package-summary.html">at.gv.egovernment.moa.id.config.proxy</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="at/gv/egovernment/moa/id/data/package-summary.html">at.gv.egovernment.moa.id.data</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="at/gv/egovernment/moa/id/proxy/package-summary.html">at.gv.egovernment.moa.id.proxy</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-</TABLE>
-
-<P>
-&nbsp;<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Overview</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="overview-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/overview-tree.html b/id/server/doc/moa_id/api-doc/overview-tree.html
deleted file mode 100644
index 583aeddde..000000000
--- a/id/server/doc/moa_id/api-doc/overview-tree.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:52 CET 2004 -->
-<TITLE>
-Class Hierarchy (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Class Hierarchy (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="overview-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For All Packages</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="at/gv/egovernment/moa/id/package-tree.html">at.gv.egovernment.moa.id</A>, <A HREF="at/gv/egovernment/moa/id/auth/package-tree.html">at.gv.egovernment.moa.id.auth</A>, <A HREF="at/gv/egovernment/moa/id/config/proxy/package-tree.html">at.gv.egovernment.moa.id.config.proxy</A>, <A HREF="at/gv/egovernment/moa/id/data/package-tree.html">at.gv.egovernment.moa.id.data</A>, <A HREF="at/gv/egovernment/moa/id/proxy/package-tree.html">at.gv.egovernment.moa.id.proxy</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">class java.lang.<A HREF="http://java.sun.com/j2se/1.3/docs/api/java/lang/Object.html" title="class or interface in java.lang"><B>Object</B></A><UL>
-<LI TYPE="circle">class at.gv.egovernment.moa.id.data.<A HREF="at/gv/egovernment/moa/id/data/AuthenticationData.html" title="class in at.gv.egovernment.moa.id.data"><B>AuthenticationData</B></A><LI TYPE="circle">class at.gv.egovernment.moa.id.auth.<A HREF="at/gv/egovernment/moa/id/auth/AuthenticationServer.html" title="class in at.gv.egovernment.moa.id.auth"><B>AuthenticationServer</B></A><LI TYPE="circle">class MOAIDException<UL>
-<LI TYPE="circle">class at.gv.egovernment.moa.id.<A HREF="at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id"><B>AuthenticationException</B></A></UL>
-<LI TYPE="circle">class MOAIDException<UL>
-<LI TYPE="circle">class at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy"><B>LoginParameterResolverException</B></A></UL>
-<LI TYPE="circle">class MOAIDException<UL>
-<LI TYPE="circle">class at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/NotAllowedException.html" title="class in at.gv.egovernment.moa.id.proxy"><B>NotAllowedException</B></A></UL>
-<LI TYPE="circle">class at.gv.egovernment.moa.id.config.proxy.<A HREF="at/gv/egovernment/moa/id/config/proxy/OAConfiguration.html" title="class in at.gv.egovernment.moa.id.config.proxy"><B>OAConfiguration</B></A></UL>
-</UL>
-<H2>
-Interface Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/ConnectionBuilder.html" title="interface in at.gv.egovernment.moa.id.proxy"><B>ConnectionBuilder</B></A><LI TYPE="circle">interface at.gv.egovernment.moa.id.proxy.<A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolver.html" title="interface in at.gv.egovernment.moa.id.proxy"><B>LoginParameterResolver</B></A></UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="overview-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/package-list b/id/server/doc/moa_id/api-doc/package-list
deleted file mode 100644
index 4cafbedb3..000000000
--- a/id/server/doc/moa_id/api-doc/package-list
+++ /dev/null
@@ -1,5 +0,0 @@
-at.gv.egovernment.moa.id
-at.gv.egovernment.moa.id.auth
-at.gv.egovernment.moa.id.config.proxy
-at.gv.egovernment.moa.id.data
-at.gv.egovernment.moa.id.proxy
diff --git a/id/server/doc/moa_id/api-doc/packages.html b/id/server/doc/moa_id/api-doc/packages.html
deleted file mode 100644
index dc4a5e004..000000000
--- a/id/server/doc/moa_id/api-doc/packages.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
- (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title=" (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-<BR>
-
-<BR>
-
-<BR>
-<CENTER>
-The front page has been relocated.Please see:
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A HREF="index.html">Frame version</A>
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A HREF="overview-summary.html">Non-frame version.</A></CENTER>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/resources/inherit.gif b/id/server/doc/moa_id/api-doc/resources/inherit.gif
deleted file mode 100644
index c814867a1..000000000
Binary files a/id/server/doc/moa_id/api-doc/resources/inherit.gif and /dev/null differ
diff --git a/id/server/doc/moa_id/api-doc/serialized-form.html b/id/server/doc/moa_id/api-doc/serialized-form.html
deleted file mode 100644
index feb57f861..000000000
--- a/id/server/doc/moa_id/api-doc/serialized-form.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_01) on Mon Mar 15 15:50:53 CET 2004 -->
-<TITLE>
-Serialized Form (MOA ID API)
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Serialized Form (MOA ID API)";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="serialized-form.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H1>
-Serialized Form</H1>
-</CENTER>
-<A NAME="at.gv.egovernment.moa.id.AuthenticationException"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Class <A HREF="at/gv/egovernment/moa/id/AuthenticationException.html" title="class in at.gv.egovernment.moa.id">at.gv.egovernment.moa.id.AuthenticationException</A> extends MOAIDException implements Serializable</B></FONT></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<P>
-<HR SIZE="4" NOSHADE>
-<A NAME="at.gv.egovernment.moa.id.proxy.LoginParameterResolverException"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Class <A HREF="at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.html" title="class in at.gv.egovernment.moa.id.proxy">at.gv.egovernment.moa.id.proxy.LoginParameterResolverException</A> extends MOAIDException implements Serializable</B></FONT></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<P>
-<HR SIZE="4" NOSHADE>
-<A NAME="at.gv.egovernment.moa.id.proxy.NotAllowedException"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Class <A HREF="at/gv/egovernment/moa/id/proxy/NotAllowedException.html" title="class in at.gv.egovernment.moa.id.proxy">at.gv.egovernment.moa.id.proxy.NotAllowedException</A> extends MOAIDException implements Serializable</B></FONT></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="serialized-form.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/id/server/doc/moa_id/api-doc/stylesheet.css b/id/server/doc/moa_id/api-doc/stylesheet.css
deleted file mode 100644
index 14c3737e8..000000000
--- a/id/server/doc/moa_id/api-doc/stylesheet.css
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Javadoc style sheet */
-
-/* Define colors, fonts and other style attributes here to override the defaults */
-
-/* Page background color */
-body { background-color: #FFFFFF }
-
-/* Headings */
-h1 { font-size: 145% }
-
-/* Table colors */
-.TableHeadingColor     { background: #CCCCFF } /* Dark mauve */
-.TableSubHeadingColor  { background: #EEEEFF } /* Light mauve */
-.TableRowColor         { background: #FFFFFF } /* White */
-
-/* Font used in left-hand frame lists */
-.FrameTitleFont   { font-size: 100%; font-family: Helvetica, Arial, sans-serif }
-.FrameHeadingFont { font-size:  90%; font-family: Helvetica, Arial, sans-serif }
-.FrameItemFont    { font-size:  90%; font-family: Helvetica, Arial, sans-serif }
-
-/* Navigation bar fonts and colors */
-.NavBarCell1    { background-color:#EEEEFF;} /* Light mauve */
-.NavBarCell1Rev { background-color:#00008B;} /* Dark Blue */
-.NavBarFont1    { font-family: Arial, Helvetica, sans-serif; color:#000000;}
-.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;}
-
-.NavBarCell2    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
-.NavBarCell3    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
-
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index a10f5eead..0d98d1dc7 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -1,164 +1,152 @@
 <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>
+    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>idserverlib</artifactId>
-  <packaging>jar</packaging>
-  <version>1.4.0</version>
-  <name>MOA ID Serverlibrary</name>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>MOA.id.server</groupId>
+    <artifactId>moa-id-lib</artifactId>
+    <packaging>jar</packaging>
+    <version>1.4.0</version>
+    <name>MOA ID API</name>
+
+    <properties>
+        <repositoryPath>${basedir}/../../../repository</repositoryPath>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>axis</groupId>
+            <artifactId>axis</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xmlParserAPIs</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-discovery</groupId>
+            <artifactId>commons-discovery</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>dav4j</groupId>
+            <artifactId>dav4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>httpsclient</groupId>
+            <artifactId>httpsclient</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>MOA</groupId>
+            <artifactId>moa-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>MOA</groupId>
+            <artifactId>moa-common-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>MOA.spss.server</groupId>
+            <artifactId>moa-spss-lib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_moa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_ecc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_jce_full</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_ixsil</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_X509TrustManager</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <quiet>true</quiet>
+                    <author>false</author>
+                    <version>false</version>
+                    <use>true</use>
+                    <excludePackageNames>
+                        at.gv.egovernment.moa.spss.server.*;at.gv.egovernment.moa.spss.api.impl.*;at.gv.egovernment.moa.spss.impl.*
+                    </excludePackageNames>
+                    <tags>
+                        <tag>
+                            <name>pre</name>
+                            <placement>a</placement>
+                            <head>Preconditions:</head>
+                        </tag>
+                        <tag>
+                            <name>post</name>
+                            <placement>a</placement>
+                            <head>Postconfitions:</head>
+                        </tag>
+                    </tags>
+                    <link>http://java.sun.com/j2se/1.4/docs/api/</link>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>generate-javadoc</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
-  <properties>
-  	<thirdPartyLib>${basedir}/../../../buildhelper</thirdPartyLib>
-  </properties>
-  
-  <dependencies>
-    <dependency>
-      <groupId>javaext</groupId>
-      <artifactId>activation</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>axis</groupId>
-      <artifactId>axis</artifactId>
-      <version>1.4</version>
-    </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>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-<!--			<version>2.3-fcs</version>-->
-			<scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>saaj</groupId>
-      <artifactId>saaj</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>jaxp-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>dom</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>sax</artifactId>
-    </dependency>
-	    <dependency>
-	      <groupId>xerces</groupId>
-	      <artifactId>xercesImpl</artifactId>
-	    </dependency>    
-	    <dependency>
-	      <groupId>xerces</groupId>
-	      <artifactId>xmlParserAPIs</artifactId>
-	    </dependency>  
-	    <dependency>
-	      <groupId>jaxen</groupId>
-	      <artifactId>jaxen-core</artifactId>
-	    </dependency>
-	    <dependency>
-	      <groupId>jaxen</groupId>
-	      <artifactId>jaxen-dom</artifactId>
-	    </dependency>
-	    <dependency>
-	      <groupId>jaxen</groupId>
-	      <artifactId>saxpath</artifactId>
-	    </dependency>
-	    <dependency>
-	      <groupId>xalan</groupId>
-	      <artifactId>xalan</artifactId>
-	    </dependency>
-	    <dependency>
-	      <groupId>junit</groupId>
-	      <artifactId>junit</artifactId>
-	    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jsse</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jnet</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jcert</artifactId>
-    </dependency>
-	    <dependency>
-	      <groupId>commons-logging</groupId>
-	      <artifactId>commons-logging</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>dav4j</groupId>
-      <artifactId>dav4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>httpsclient</groupId>
-      <artifactId>httpsclient</artifactId>
-    </dependency>
-    <dependency>
-	      <groupId>MOA</groupId>
-	      <artifactId>common</artifactId>
-  	  </dependency>
-    <dependency>
-	      <groupId>MOA</groupId>
-	      <artifactId>common-test</artifactId>
-  	  </dependency>
-    <dependency>
-      <groupId>MOA.spss.server</groupId>
-      <artifactId>serverlib</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_moa_full</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_ecc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_jce_full</artifactId>
-<!--      <version>3.14</version>-->
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_ixsil</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_X509TrustManager</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_ldap</artifactId>
-    </dependency>
-  </dependencies>
 </project>
diff --git a/id/server/pom.xml b/id/server/pom.xml
index 9c49a5885..eaa59d06f 100644
--- a/id/server/pom.xml
+++ b/id/server/pom.xml
@@ -1,134 +1,27 @@
-<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</groupId>
-		<artifactId>id</artifactId>
-		<version>1.4.0</version>
-  </parent>
+<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</groupId>
+        <artifactId>id</artifactId>
+        <version>1.4.0</version>
+    </parent>
 
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>MOA.id</groupId>
-  <artifactId>server</artifactId>
-  <packaging>pom</packaging>
-  <version>1.4.0</version>
-  <name>MOA Id Server</name>
-
-	<modules>
-		<module>idserverlib</module>
-		<module>auth</module>
-		<module>proxy</module>
-		<module>distribution</module>
-	</modules>
-
- <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <verbose>true</verbose>
-          <fork>true</fork>
-          <executable>${env.BUILD_EXECUTEABLE}</executable>
-          <compilerVersion>${env.BUILD_VERSION}</compilerVersion>
-          <source>1.3</source>
-          <target>1.3</target>
-        </configuration>
-      </plugin>
-    </plugins>
- </build>
-
-	<dependencyManagement>
-		<dependencies>
-    <dependency>
-      <groupId>javaext</groupId>
-      <artifactId>activation</artifactId>
-      <version>1.0.2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>axis</groupId>
-      <artifactId>axis</artifactId>
-      <version>1.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>dav4j</groupId>
-      <artifactId>dav4j</artifactId>
-      <version>0.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>httpsclient</groupId>
-      <artifactId>httpsclient</artifactId>
-      <version>JSSE-1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>mail</groupId>
-      <artifactId>mail</artifactId>
-      <version>1.5</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
-      <version>1.1.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>1.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>MOA.spss.server</groupId>
-      <artifactId>serverlib</artifactId>
-      <version>1.4.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>postgresql</groupId>
-      <artifactId>postgresql</artifactId>
-      <version>7.3-jdbc2</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.8</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>regexp</groupId>
-      <artifactId>regexp</artifactId>
-      <version>1.3</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_Pkcs11Provider</artifactId>
-      <version>1.2.4</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_ecc_signed</artifactId>
-      <version>2.15</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_jce_full_signed</artifactId>
-      <version>3.142_MOA</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_Pkcs11Provider</artifactId>
-      <version>1.2.4</version>
-      <scope>runtime</scope>
-    </dependency>
-		</dependencies>
-	</dependencyManagement>	
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>MOA.id</groupId>
+    <artifactId>moa-id</artifactId>
+    <packaging>pom</packaging>
+    <version>1.4.0</version>
+    <name>MOA ID Server</name>
+
+    <modules>
+        <module>idserverlib</module>
+        <module>proxy</module>
+        <module>auth</module>
+    </modules>
+
+    <properties>
+        <repositoryPath>${basedir}/../../repository</repositoryPath>
+    </properties>
+
 </project>
diff --git a/id/server/proxy/assembly-war.xml b/id/server/proxy/assembly-war.xml
index b9f84d762..dba832a74 100644
--- a/id/server/proxy/assembly-war.xml
+++ b/id/server/proxy/assembly-war.xml
@@ -56,7 +56,7 @@
 			<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_moa</include>
 			<include>iaik.prod:iaik_Pkcs11Wrapper</include>
 			<include>iaik.prod:iaik_X509TrustManager</include>
 			<include>jaxen:jaxen-core</include>
@@ -74,12 +74,13 @@
 	</includes>
 		<outputDirectory>WEB-INF/lib</outputDirectory>
 	</dependencySet>
-	<dependencySet>
-		<includes>
-			<include>iaik.win32:Pkcs11Wrapper</include>
-	</includes>
-		<outputDirectory>WEB-INF/lib/win32</outputDirectory>
-	</dependencySet>
+		<dependencySet>
+			<includes>
+				<include>iaik.prod:iaik_Pkcs11Wrapper:dll:win32</include>
+			</includes>
+			<outputFileNameMapping>pkcs11wrapper.dll</outputFileNameMapping>
+			<outputDirectory>WEB-INF/lib/win32</outputDirectory>
+		</dependencySet>
 	</dependencySets>
 
  </assembly>
\ No newline at end of file
diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 0ca85d599..eb912c659 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -1,136 +1,194 @@
-<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>
+<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>
+		<artifactId>moa-id</artifactId>
 		<version>1.4.0</version>
-  </parent>
+	</parent>
 
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>MOA.id.server</groupId>
-  <artifactId>proxy</artifactId>
-  <packaging>pom</packaging>
-  <version>1.4.0</version>
-  <name>MOA Id Server Proxy</name>
+	<properties>
+		<repositoryPath>${basedir}/../../../repository</repositoryPath>
+	</properties>
+
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>MOA.id.server</groupId>
+	<artifactId>moa-id-proxy</artifactId>
+	<packaging>war</packaging>
+	<version>1.4.0</version>
+	<name>MOA ID-Proxy WebService</name>
+
+	<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>
+				<executions>
+					<execution>
+						<id>test</id>
+						<phase>package</phase>
+						<goals>
+							<goal>exploded</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
 
 	<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-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>
+		<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>
+	<!--    <dependency>-->
+	<!--      <groupId>javax.activation</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-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</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>javax.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>javax.xml</groupId>-->
+	<!--      <artifactId>jaxrpc</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.prod</groupId>-->
+	<!--      <artifactId>iaik_Pkcs11Wrapper</artifactId>-->
+	<!--      <classifier>win32</classifier>-->
+	<!--	  <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
diff --git a/id/templates/pom.xml b/id/templates/pom.xml
index b17eba962..aa100b593 100644
--- a/id/templates/pom.xml
+++ b/id/templates/pom.xml
@@ -1,13 +1,25 @@
-<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">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>MOA</groupId>
-  <artifactId>templates</artifactId>
-  <packaging>war</packaging>
-  <version>1.4.0</version>
-  <name>MOA Sample Templates</name>
-  
-  <build>
-  	<finalName>moaid-templates</finalName>
-  </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</groupId>
+        <artifactId>id</artifactId>
+        <version>1.4.0</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>MOA.id</groupId>
+    <artifactId>moa-id-templates</artifactId>
+    <packaging>war</packaging>
+    <version>1.4.0</version>
+    <name>MOA ID Sample Templates</name>
+
+    <properties>
+        <repositoryPath>${basedir}/../../repository</repositoryPath>
+    </properties>
+
+    <build>
+        <finalName>moaid-templates</finalName>
+    </build>
+
 </project>
diff --git a/pom.xml b/pom.xml
index 000825c06..c85c7b307 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,349 +1,289 @@
-<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">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>MOA</groupId>
-  <artifactId>MOA</artifactId>
-  <packaging>pom</packaging>
-  <version>1.4.0</version>
-  <name>MOA</name>
-  
-  <properties>
-  	<thirdPartyLib>${basedir}/../buildhelper</thirdPartyLib>
-  </properties>
-	
-   <profiles>
-    	<profile>
-    		<id>JDK</id>
-    		<properties>
-    			<JAVA_HOME></JAVA_HOME>
-    			<JAVA_VERSION>1.4</JAVA_VERSION>
-    		</properties>
-    	</profile>
-    	
-    	<profile>
-    		<id>subversion</id>
-    		<activation>
-					<property>
-						<name>subversion</name>
-					</property>
-    		</activation>
-    		<modules>
-    			<module>BuildHelper</module>
-    		</modules>
-    	</profile>
+<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">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>MOA</groupId>
+    <artifactId>MOA</artifactId>
+    <packaging>pom</packaging>
+    <version>1.4.0</version>
+    <name>MOA</name>
 
-    	<profile>
-    		<id>default</id>
-    		<activation>
-    			<activeByDefault>true</activeByDefault>
-					<property>
-						<name>default</name>
-					</property>
-    		</activation>
-			  <modules>
-			  	<module>common</module>
-			  	<module>common-test</module>
-					<module>spss</module>
-					<module>id</module>
-			  </modules>
-    	</profile>
+    <properties>
+        <repositoryPath>${basedir}/repository</repositoryPath>
+    </properties>
 
-    	<profile>
-    		<id>zs</id>
-    		<activation>
-    			<activeByDefault>false</activeByDefault>
-					<property>
-						<name>zs</name>
-					</property>
-    		</activation>
-			  <modules>
-			  	<module>zs</module>
-			  </modules>
-    	</profile>
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+                <property>
+                    <name>default</name>
+                </property>
+            </activation>
+            <modules>
+                <module>common</module>
+                <module>common-test</module>
+                <module>spss</module>
+                <module>id</module>
+            </modules>
+        </profile>
     </profiles>
-	
-<!--  
-  <modules>
-  	<module>BuildHelper</module>
-  	<module>common</module>
-  	<module>common-test</module>
-		<module>spss</module>
-		<module>id</module>
-		<module>zs</module>
-  </modules>
--->
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
 
-	<build>
-    <plugins>
-	    <plugin>
-	      <groupId>org.apache.maven.plugins</groupId>
-	      <artifactId>maven-surefire-plugin</artifactId>
-	      <configuration>
-	        <skip>true</skip>
-	      </configuration>
-	    </plugin>
-	    
-	    <plugin>
-	      <groupId>org.apache.maven.plugins</groupId>
-	      <artifactId>maven-compiler-plugin</artifactId>
-	      <configuration>
-					<verbose>true</verbose>
-	      </configuration>
-	    </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <verbose>true</verbose>
-          <fork>true</fork>
-          <executable>${env.BUILD_EXECUTEABLE}</executable>
-          <compilerVersion>${env.BUILD_VERSION}</compilerVersion>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-          	<manifest>
-          		<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-          	</manifest>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
-   
- </build>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <verbose>false</verbose>
+                    <fork>true</fork>
+                    <executable>${env.BUILD_EXECUTEABLE}</executable>
+                    <compilerVersion>${env.BUILD_VERSION}</compilerVersion>
+                    <source>1.3</source>
+                    <target>1.3</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <inherited>false</inherited>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.2-beta-1</version>
+                <configuration>
+                    <descriptors>
+                        <descriptor>id/assembly-auth.xml</descriptor>
+                        <descriptor>id/assembly-proxy.xml</descriptor>
+                        <descriptor>spss/assembly.xml</descriptor>
+                    </descriptors>
+                </configuration>
+            </plugin>
+        </plugins>
 
-	<reporting>
-		<plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <excludePackageNames>test.*</excludePackageNames>
-        </configuration>
-      </plugin>    
-		</plugins>
-	</reporting>
+    </build>
 
-	<dependencyManagement>
-	  <dependencies>
-	    <dependency>
-	      <groupId>MOA</groupId>
-	      <artifactId>common</artifactId>
-	      <version>1.4.0</version>
-	      <scope>compile</scope>
-  	  </dependency>
-	    <dependency>
-	      <groupId>MOA</groupId>
-	      <artifactId>common-test</artifactId>
-	      <version>1.4.0</version>
-	      <scope>test</scope>
-  	  </dependency>
-	    <dependency>
-	      <groupId>junit</groupId>
-	      <artifactId>junit</artifactId>
-	      <version>3.8.1</version>
-	      <scope>test</scope>
-	    </dependency>
-	    <dependency>
-	      <groupId>commons-logging</groupId>
-	      <artifactId>commons-logging</artifactId>
-	      <version>1.0.4</version>
-	      <scope>compile</scope>
-	    </dependency>
-	    <dependency>
-	      <groupId>iaik.prod</groupId>
-	      <artifactId>iaik_jce_full</artifactId>
-	      <version>3.13</version>
-	      <scope>compile</scope>
-	    </dependency>
-	    <dependency>
-	      <groupId>javax.servlet</groupId>
-	      <artifactId>servlet-api</artifactId>
-	      <version>2.4</version>
-	      <scope>compile</scope>
-	    </dependency>   
-	<dependency>
-      <groupId>javax.activation</groupId>
-      <artifactId>activation</artifactId>
-      <version>1.0.2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.xml</groupId>
-      <artifactId>jaxrpc-api</artifactId>
-      <version>1.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>saaj</groupId>
-      <artifactId>saaj</artifactId>
-      <version>1.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>jaxp-api</artifactId>
-      <version>1.2_01</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>dom</artifactId>
-      <version>1.2_01</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>sax</artifactId>
-      <version>1.2_01</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jsse</artifactId>
-      <version>1.0.3_03</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jnet</artifactId>
-      <version>1.0.3_03</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jcert</artifactId>
-      <version>1.0.3_03</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-discovery</groupId>
-      <artifactId>commons-discovery</artifactId>
-      <version>0.2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_moa_full</artifactId>
-      <version>1.20</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_ecc</artifactId>
-      <version>2.15</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_ixsil</artifactId>
-      <version>IXSIL-1.2.2.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_X509TrustManager</artifactId>
-      <version>0.2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_ldap</artifactId>
-      <version>2003-04-29</version>
-      <scope>compile</scope>
-    </dependency>
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <excludePackageNames>test.*</excludePackageNames>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
 
-	    <dependency>
-	      <groupId>jaxen</groupId>
-	      <artifactId>jaxen-core</artifactId>
-				<scope>compile</scope>
-				<version>1.0</version>
-	    </dependency>
-	    <dependency>
-	      <groupId>jaxen</groupId>
-	      <artifactId>jaxen-dom</artifactId>
-				<scope>compile</scope>
-				<version>1.0</version>
-	    </dependency>
-	    <dependency>
-	      <groupId>jaxen</groupId>
-	      <artifactId>saxpath</artifactId>
-				<scope>compile</scope>
-				<version>1.0</version>
-	    </dependency>
-	    <dependency>
-	      <groupId>jaxp</groupId>
-	      <artifactId>jaxp-api</artifactId>
-	      <version>1.2_01</version>
-	      <scope>compile</scope>
-	    </dependency>
-	    <dependency>
-	      <groupId>jsse</groupId>
-	      <artifactId>jsse</artifactId>
-	      <version>1.0.3_03</version>
-	      <scope>compile</scope>
-	    </dependency>
-    <dependency>
-	    <groupId>taglibs</groupId>
-      <artifactId>standard</artifactId>
-      <version>1.1.0</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>wsdl4j</groupId>
-      <artifactId>wsdl4j</artifactId>
-      <version>1.4</version>
-      <scope>runtime</scope>
-    </dependency>
-	    <dependency>
-	      <groupId>xalan</groupId>
-	      <artifactId>xalan</artifactId>
-	      <version>2.5.1</version>
-	      <scope>compile</scope>
-	    </dependency>
-	    <dependency>
-	      <groupId>xerces</groupId>
-	      <artifactId>xercesImpl</artifactId>
-	      <version>2.4.0</version>
-	      <scope>compile</scope>
-	    </dependency>    
-	    <dependency>
-	      <groupId>xerces</groupId>
-	      <artifactId>xmlParserAPIs</artifactId>
-	      <version>2.6.0</version>
-	      <scope>compile</scope>
-	    </dependency>  
-	    <dependency>
-	      <groupId>xmlrpc</groupId>
-	      <artifactId>xmlrpc</artifactId>
-	      <version>1.1</version>
-	      <scope>runtime</scope>
-	    </dependency>
-	  </dependencies>
-  </dependencyManagement>
+    <dependencyManagement>
+        <dependencies>
 
-  <repositories>
-  	<repository>
-  		<id>MOA-download-open</id>
-  		<name>MOA Download Open Repository</name>
-  		<!--releases>
-  			<enabled>false</enabled>
-  		</releases-->
-  		<layout>default</layout>
-  		<url>file://${thirdPartyLib}/openLib</url>
-  	</repository>
-  	<repository>
-  		<id>MOA-download-closed</id>
-  		<name>MOA Download Closed Repository</name>
-  		<!--releases>
-  			<enabled>false</enabled>
-  		</releases-->
-  		<layout>default</layout>
-  		<url>file://${thirdPartyLib}/closedLib</url>
-  	</repository>
-  </repositories>  
+            <dependency>
+                <groupId>axis</groupId>
+                <artifactId>axis</artifactId>
+                <version>1.4</version>
+            </dependency>
+
+            <dependency>
+                <groupId>jaxen</groupId>
+                <artifactId>jaxen</artifactId>
+                <version>1.0-FCS</version>
+            </dependency>
+            <dependency>
+                <groupId>saxpath</groupId>
+                <artifactId>saxpath</artifactId>
+                <version>1.0-FCS</version>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.7</version>
+                <scope>runtime</scope>
+            </dependency>
+            <dependency>
+                <groupId>postgresql</groupId>
+                <artifactId>postgresql</artifactId>
+                <version>7.2</version>
+                <scope>runtime</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>javax.mail</groupId>
+                <artifactId>mail</artifactId>
+                <version>1.4</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-fileupload</groupId>
+                <artifactId>commons-fileupload</artifactId>
+                <version>1.1.1</version>
+            </dependency>
+            <dependency>
+                <groupId>dav4j</groupId>
+                <artifactId>dav4j</artifactId>
+                <version>0.1</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>httpsclient</groupId>
+                <artifactId>httpsclient</artifactId>
+                <version>JSSE-1.0</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>regexp</groupId>
+                <artifactId>regexp</artifactId>
+                <version>1.3</version>
+            </dependency>
+
+
+            <dependency>
+                <groupId>MOA</groupId>
+                <artifactId>moa-common</artifactId>
+                <version>1.4.0</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>MOA</groupId>
+                <artifactId>moa-common-test</artifactId>
+                <version>1.4.0</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>3.8.1</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>1.0.4</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+                <version>2.4</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>javax.activation</groupId>
+                <artifactId>activation</artifactId>
+                <version>1.1</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>commons-discovery</groupId>
+                <artifactId>commons-discovery</artifactId>
+                <version>0.2</version>
+                <scope>compile</scope>
+            </dependency>
+
+            <!-- IAIK libraries -->
+            <dependency>
+                <groupId>iaik.prod</groupId>
+                <artifactId>iaik_jce_full</artifactId>
+                <version>3.142_MOA</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>iaik.prod</groupId>
+                <artifactId>iaik_moa</artifactId>
+                <version>1.20</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>iaik.prod</groupId>
+                <artifactId>iaik_cms</artifactId>
+                <version>3.2</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>iaik.prod</groupId>
+                <artifactId>iaik_ecc</artifactId>
+                <version>2.15</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>iaik.prod</groupId>
+                <artifactId>iaik_ixsil</artifactId>
+                <version>IXSIL-1.2.2.3</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>iaik.prod</groupId>
+                <artifactId>iaik_X509TrustManager</artifactId>
+                <version>0.2</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>iaik.prod</groupId>
+                <artifactId>iaik_Pkcs11Provider</artifactId>
+                <version>1.2.4</version>
+                <scope>runtime</scope>
+            </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_Pkcs11Wrapper</artifactId>
+                <version>1.2.16</version>
+                <classifier>win32</classifier>
+                <type>dll</type>
+                <scope>runtime</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>xalan</groupId>
+                <artifactId>xalan</artifactId>
+                <version>2.5.1</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>xerces</groupId>
+                <artifactId>xercesImpl</artifactId>
+                <version>2.4.0</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>xerces</groupId>
+                <artifactId>xmlParserAPIs</artifactId>
+                <version>2.6.0</version>
+                <scope>compile</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <repositories>
+        <repository>
+            <id>IAIK-MOA</id>
+            <name>IAIK MOA Libraries</name>
+            <!--releases>
+                <enabled>false</enabled>
+                </releases-->
+            <layout>default</layout>
+            <url>file://${repositoryPath}</url>
+        </repository>
+    </repositories>
 </project>
diff --git a/repository/dav4j/dav4j/0.1/dav4j-0.1.jar b/repository/dav4j/dav4j/0.1/dav4j-0.1.jar
new file mode 100644
index 000000000..9a5a7bf81
Binary files /dev/null and b/repository/dav4j/dav4j/0.1/dav4j-0.1.jar differ
diff --git a/repository/dav4j/dav4j/0.1/dav4j-0.1.pom b/repository/dav4j/dav4j/0.1/dav4j-0.1.pom
new file mode 100644
index 000000000..05ebd2471
--- /dev/null
+++ b/repository/dav4j/dav4j/0.1/dav4j-0.1.pom
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>dav4j</groupId>
+  <artifactId>dav4j</artifactId>
+  <version>0.1</version>
+  <description>POM was created from install:install-file</description>
+</project>
\ No newline at end of file
diff --git a/repository/dav4j/dav4j/maven-metadata-local.xml b/repository/dav4j/dav4j/maven-metadata-local.xml
new file mode 100644
index 000000000..777457a09
--- /dev/null
+++ b/repository/dav4j/dav4j/maven-metadata-local.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>dav4j</groupId>
+  <artifactId>dav4j</artifactId>
+  <version>0.1</version>
+  <versioning>
+    <versions>
+      <version>0.1</version>
+    </versions>
+    <lastUpdated>20070814132458</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file
diff --git a/repository/httpsclient/httpsclient/JSSE-1.0/httpsclient-JSSE-1.0.jar b/repository/httpsclient/httpsclient/JSSE-1.0/httpsclient-JSSE-1.0.jar
new file mode 100644
index 000000000..a9272deb1
Binary files /dev/null and b/repository/httpsclient/httpsclient/JSSE-1.0/httpsclient-JSSE-1.0.jar differ
diff --git a/repository/httpsclient/httpsclient/JSSE-1.0/httpsclient-JSSE-1.0.pom b/repository/httpsclient/httpsclient/JSSE-1.0/httpsclient-JSSE-1.0.pom
new file mode 100644
index 000000000..06e1fe40e
--- /dev/null
+++ b/repository/httpsclient/httpsclient/JSSE-1.0/httpsclient-JSSE-1.0.pom
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>httpsclient</groupId>
+  <artifactId>httpsclient</artifactId>
+  <version>JSSE-1.0</version>
+  <description>POM was created from install:install-file</description>
+</project>
\ No newline at end of file
diff --git a/repository/httpsclient/httpsclient/maven-metadata-local.xml b/repository/httpsclient/httpsclient/maven-metadata-local.xml
new file mode 100644
index 000000000..f64c2577e
--- /dev/null
+++ b/repository/httpsclient/httpsclient/maven-metadata-local.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>httpsclient</groupId>
+  <artifactId>httpsclient</artifactId>
+  <version>JSSE-1.0</version>
+  <versioning>
+    <versions>
+      <version>JSSE-1.0</version>
+    </versions>
+    <lastUpdated>20070814132409</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.jar b/repository/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.jar
new file mode 100644
index 000000000..a348db04e
Binary files /dev/null and b/repository/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.jar differ
diff --git a/repository/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.jar.md5 b/repository/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.jar.md5
new file mode 100644
index 000000000..755cc47fb
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.jar.md5
@@ -0,0 +1 @@
+693dcf03f52dbadaa707fb1f5dd0085a
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.jar.sha1 b/repository/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.jar.sha1
new file mode 100644
index 000000000..6e133b3f8
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.jar.sha1
@@ -0,0 +1 @@
+a58003f524217da40c7a85982636cb937d3b93bb
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.pom b/repository/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.pom
new file mode 100644
index 000000000..4325fd109
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.pom
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>iaik.prod</groupId>
+  <artifactId>iaik_Pkcs11Provider</artifactId>
+  <version>1.2.4</version>
+  <description>POM was created from install:install-file</description>
+</project>
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.pom.md5 b/repository/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.pom.md5
new file mode 100644
index 000000000..6d6d1f79c
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.pom.md5
@@ -0,0 +1 @@
+6f94c976c6da78186b711fd9c4befdb9
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.pom.sha1 b/repository/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.pom.sha1
new file mode 100644
index 000000000..15135d6c2
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Provider/1.2.4/iaik_Pkcs11Provider-1.2.4.pom.sha1
@@ -0,0 +1 @@
+c59283c32ddee2a546e7d2045dbf52bb88bd7347
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml b/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml
new file mode 100644
index 000000000..7a76487ab
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>iaik.prod</groupId>
+  <artifactId>iaik_Pkcs11Provider</artifactId>
+  <version>1.2.4</version>
+  <versioning>
+    <latest>1.2.4</latest>
+    <release>1.2.4</release>
+    <versions>
+      <version>1.2.4</version>
+    </versions>
+    <lastUpdated>20070814085134</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml.md5 b/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml.md5
new file mode 100644
index 000000000..47cb1967e
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml.md5
@@ -0,0 +1 @@
+0a8cf5b3db2e06b822ab0a396784f102
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml.sha1 b/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml.sha1
new file mode 100644
index 000000000..f83857744
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml.sha1
@@ -0,0 +1 @@
+4d66c586f60c6ffc9a330b5ce1f0644d7399966a
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml b/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml
new file mode 100644
index 000000000..7a76487ab
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>iaik.prod</groupId>
+  <artifactId>iaik_Pkcs11Provider</artifactId>
+  <version>1.2.4</version>
+  <versioning>
+    <latest>1.2.4</latest>
+    <release>1.2.4</release>
+    <versions>
+      <version>1.2.4</version>
+    </versions>
+    <lastUpdated>20070814085134</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml.md5 b/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml.md5
new file mode 100644
index 000000000..47cb1967e
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml.md5
@@ -0,0 +1 @@
+0a8cf5b3db2e06b822ab0a396784f102
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml.sha1 b/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml.sha1
new file mode 100644
index 000000000..f83857744
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+4d66c586f60c6ffc9a330b5ce1f0644d7399966a
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-win32.dll b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-win32.dll
new file mode 100644
index 000000000..3789b8d7a
Binary files /dev/null and b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-win32.dll differ
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-win32.dll.md5 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-win32.dll.md5
new file mode 100644
index 000000000..50e00efc6
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-win32.dll.md5
@@ -0,0 +1 @@
+39a366ffd368a1c9eaf05b544a06f875
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-win32.dll.sha1 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-win32.dll.sha1
new file mode 100644
index 000000000..d4f721d4b
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-win32.dll.sha1
@@ -0,0 +1 @@
+17388b3df0e5c397dec18a438674b14901342fa3
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.jar b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.jar
new file mode 100644
index 000000000..43342ef7c
Binary files /dev/null and b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.jar differ
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.jar.md5 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.jar.md5
new file mode 100644
index 000000000..39f690ed6
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.jar.md5
@@ -0,0 +1 @@
+638cc3d2ee90445c6683e55561295df5
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.jar.sha1 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.jar.sha1
new file mode 100644
index 000000000..12787ee27
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.jar.sha1
@@ -0,0 +1 @@
+a5ef19ea43be5e16f85240b842f16a7f202e0049
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom
new file mode 100644
index 000000000..c35dc3ff4
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>iaik.prod</groupId>
+  <artifactId>iaik_Pkcs11Wrapper</artifactId>
+  <packaging>dll</packaging>
+  <version>1.2.16</version>
+  <description>POM was created from install:install-file</description>
+</project>
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.md5 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.md5
new file mode 100644
index 000000000..a0aecbbdd
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.md5
@@ -0,0 +1 @@
+cfc860671159b339ec43c9582a9f50e4
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.sha1 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.sha1
new file mode 100644
index 000000000..a588353d1
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.sha1
@@ -0,0 +1 @@
+3eafa5eae317b8f7160560e7b089285fc95fe636
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata-central.xml b/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata-central.xml
new file mode 100644
index 000000000..1a1b65b5f
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata-central.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>iaik.prod</groupId>
+  <artifactId>iaik_Pkcs11Wrapper</artifactId>
+  <version>1.2.16</version>
+  <versioning>
+    <latest>1.2.16</latest>
+    <release>1.2.16</release>
+    <versions>
+      <version>1.2.16</version>
+    </versions>
+    <lastUpdated>20070814085134</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata-central.xml.md5 b/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata-central.xml.md5
new file mode 100644
index 000000000..a1f79b0ce
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata-central.xml.md5
@@ -0,0 +1 @@
+c38b8b9714dd794e9d4fe257b44f51fe
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata-central.xml.sha1 b/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata-central.xml.sha1
new file mode 100644
index 000000000..d8736b3a3
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata-central.xml.sha1
@@ -0,0 +1 @@
+6142fc6556cf0b3b8cc4a850acf070df950242e7
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml b/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml
new file mode 100644
index 000000000..1a1b65b5f
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>iaik.prod</groupId>
+  <artifactId>iaik_Pkcs11Wrapper</artifactId>
+  <version>1.2.16</version>
+  <versioning>
+    <latest>1.2.16</latest>
+    <release>1.2.16</release>
+    <versions>
+      <version>1.2.16</version>
+    </versions>
+    <lastUpdated>20070814085134</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.md5 b/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.md5
new file mode 100644
index 000000000..a1f79b0ce
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.md5
@@ -0,0 +1 @@
+c38b8b9714dd794e9d4fe257b44f51fe
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.sha1 b/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.sha1
new file mode 100644
index 000000000..d8736b3a3
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+6142fc6556cf0b3b8cc4a850acf070df950242e7
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.jar b/repository/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.jar
new file mode 100644
index 000000000..0c2d98400
Binary files /dev/null and b/repository/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.jar differ
diff --git a/repository/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.jar.md5 b/repository/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.jar.md5
new file mode 100644
index 000000000..03de5944e
--- /dev/null
+++ b/repository/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.jar.md5
@@ -0,0 +1 @@
+2def897df8ea889bd1160cd311b61a42
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.jar.sha1 b/repository/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.jar.sha1
new file mode 100644
index 000000000..80aa2ea09
--- /dev/null
+++ b/repository/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.jar.sha1
@@ -0,0 +1 @@
+39bfb3145140f6b53f3a15f9236b3c507049d2f5
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.pom b/repository/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.pom
new file mode 100644
index 000000000..f4c3c25cd
--- /dev/null
+++ b/repository/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.pom
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>iaik.prod</groupId>
+  <artifactId>iaik_X509TrustManager</artifactId>
+  <version>0.2</version>
+  <description>POM was created from install:install-file</description>
+</project>
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.pom.md5 b/repository/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.pom.md5
new file mode 100644
index 000000000..4ad6445ba
--- /dev/null
+++ b/repository/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.pom.md5
@@ -0,0 +1 @@
+aaaaff7a5d6a29d0a4256527a8616ef4
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.pom.sha1 b/repository/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.pom.sha1
new file mode 100644
index 000000000..a51e29ffa
--- /dev/null
+++ b/repository/iaik/prod/iaik_X509TrustManager/0.2/iaik_X509TrustManager-0.2.pom.sha1
@@ -0,0 +1 @@
+4252e14194fb7fc66b91331015cebc9a9e1b2e9b
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_X509TrustManager/maven-metadata-central.xml b/repository/iaik/prod/iaik_X509TrustManager/maven-metadata-central.xml
new file mode 100644
index 000000000..78628aba4
--- /dev/null
+++ b/repository/iaik/prod/iaik_X509TrustManager/maven-metadata-central.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>iaik.prod</groupId>
+  <artifactId>iaik_X509TrustManager</artifactId>
+  <version>0.2</version>
+  <versioning>
+    <latest>0.2</latest>
+    <release>0.2</release>
+    <versions>
+      <version>0.2</version>
+    </versions>
+    <lastUpdated>20070814085134</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_X509TrustManager/maven-metadata-central.xml.md5 b/repository/iaik/prod/iaik_X509TrustManager/maven-metadata-central.xml.md5
new file mode 100644
index 000000000..d68881b50
--- /dev/null
+++ b/repository/iaik/prod/iaik_X509TrustManager/maven-metadata-central.xml.md5
@@ -0,0 +1 @@
+9b68f57f4da5b1b5f917519aec1255d9
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_X509TrustManager/maven-metadata-central.xml.sha1 b/repository/iaik/prod/iaik_X509TrustManager/maven-metadata-central.xml.sha1
new file mode 100644
index 000000000..99d2c7f38
--- /dev/null
+++ b/repository/iaik/prod/iaik_X509TrustManager/maven-metadata-central.xml.sha1
@@ -0,0 +1 @@
+36334d140a18f20c03073a6b090a240296ec6dbd
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_X509TrustManager/maven-metadata.xml b/repository/iaik/prod/iaik_X509TrustManager/maven-metadata.xml
new file mode 100644
index 000000000..78628aba4
--- /dev/null
+++ b/repository/iaik/prod/iaik_X509TrustManager/maven-metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>iaik.prod</groupId>
+  <artifactId>iaik_X509TrustManager</artifactId>
+  <version>0.2</version>
+  <versioning>
+    <latest>0.2</latest>
+    <release>0.2</release>
+    <versions>
+      <version>0.2</version>
+    </versions>
+    <lastUpdated>20070814085134</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_X509TrustManager/maven-metadata.xml.md5 b/repository/iaik/prod/iaik_X509TrustManager/maven-metadata.xml.md5
new file mode 100644
index 000000000..d68881b50
--- /dev/null
+++ b/repository/iaik/prod/iaik_X509TrustManager/maven-metadata.xml.md5
@@ -0,0 +1 @@
+9b68f57f4da5b1b5f917519aec1255d9
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_X509TrustManager/maven-metadata.xml.sha1 b/repository/iaik/prod/iaik_X509TrustManager/maven-metadata.xml.sha1
new file mode 100644
index 000000000..99d2c7f38
--- /dev/null
+++ b/repository/iaik/prod/iaik_X509TrustManager/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+36334d140a18f20c03073a6b090a240296ec6dbd
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.jar b/repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.jar
new file mode 100644
index 000000000..7264a68f3
Binary files /dev/null and b/repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.jar differ
diff --git a/repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.jar.md5 b/repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.jar.md5
new file mode 100644
index 000000000..135ca88b4
--- /dev/null
+++ b/repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.jar.md5
@@ -0,0 +1 @@
+df156c243844deb2ecb9bb0fcac3e9d2
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.jar.sha1 b/repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.jar.sha1
new file mode 100644
index 000000000..0b2893963
--- /dev/null
+++ b/repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.jar.sha1
@@ -0,0 +1 @@
+d8124f1cd0dad11a0700d832fcd1479ca7d85216
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.pom b/repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.pom
new file mode 100644
index 000000000..50ac46bd6
--- /dev/null
+++ b/repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.pom
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>iaik.prod</groupId>
+  <artifactId>iaik_cms</artifactId>
+  <version>3.2</version>
+  <description>POM was created from install:install-file</description>
+</project>
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.pom.md5 b/repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.pom.md5
new file mode 100644
index 000000000..60d003cc6
--- /dev/null
+++ b/repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.pom.md5
@@ -0,0 +1 @@
+7c2aabea82fe69f10b43a49d8cfd9078
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.pom.sha1 b/repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.pom.sha1
new file mode 100644
index 000000000..3d66164a0
--- /dev/null
+++ b/repository/iaik/prod/iaik_cms/3.2/iaik_cms-3.2.pom.sha1
@@ -0,0 +1 @@
+24165b6ca4328e1e542aa4a492c7a2a2d3609c38
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_cms/maven-metadata-central.xml b/repository/iaik/prod/iaik_cms/maven-metadata-central.xml
new file mode 100644
index 000000000..60bd594f9
--- /dev/null
+++ b/repository/iaik/prod/iaik_cms/maven-metadata-central.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>iaik.prod</groupId>
+  <artifactId>iaik_cms</artifactId>
+  <version>3.2</version>
+  <versioning>
+    <latest>3.2</latest>
+    <release>3.2</release>
+    <versions>
+      <version>3.2</version>
+    </versions>
+    <lastUpdated>20070814085134</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_cms/maven-metadata-central.xml.md5 b/repository/iaik/prod/iaik_cms/maven-metadata-central.xml.md5
new file mode 100644
index 000000000..fa588f4b1
--- /dev/null
+++ b/repository/iaik/prod/iaik_cms/maven-metadata-central.xml.md5
@@ -0,0 +1 @@
+4f7c312cd075be35ef0eb948a2226c59
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_cms/maven-metadata-central.xml.sha1 b/repository/iaik/prod/iaik_cms/maven-metadata-central.xml.sha1
new file mode 100644
index 000000000..501cc0951
--- /dev/null
+++ b/repository/iaik/prod/iaik_cms/maven-metadata-central.xml.sha1
@@ -0,0 +1 @@
+2b8b98390bf81926e1933aab3b183e397c568f17
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_cms/maven-metadata.xml b/repository/iaik/prod/iaik_cms/maven-metadata.xml
new file mode 100644
index 000000000..60bd594f9
--- /dev/null
+++ b/repository/iaik/prod/iaik_cms/maven-metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>iaik.prod</groupId>
+  <artifactId>iaik_cms</artifactId>
+  <version>3.2</version>
+  <versioning>
+    <latest>3.2</latest>
+    <release>3.2</release>
+    <versions>
+      <version>3.2</version>
+    </versions>
+    <lastUpdated>20070814085134</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_cms/maven-metadata.xml.md5 b/repository/iaik/prod/iaik_cms/maven-metadata.xml.md5
new file mode 100644
index 000000000..fa588f4b1
--- /dev/null
+++ b/repository/iaik/prod/iaik_cms/maven-metadata.xml.md5
@@ -0,0 +1 @@
+4f7c312cd075be35ef0eb948a2226c59
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_cms/maven-metadata.xml.sha1 b/repository/iaik/prod/iaik_cms/maven-metadata.xml.sha1
new file mode 100644
index 000000000..501cc0951
--- /dev/null
+++ b/repository/iaik/prod/iaik_cms/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+2b8b98390bf81926e1933aab3b183e397c568f17
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ecc/2.15/iaik_ecc-2.15.jar b/repository/iaik/prod/iaik_ecc/2.15/iaik_ecc-2.15.jar
new file mode 100644
index 000000000..b8a4f190b
Binary files /dev/null and b/repository/iaik/prod/iaik_ecc/2.15/iaik_ecc-2.15.jar differ
diff --git a/repository/iaik/prod/iaik_ecc/2.15/iaik_ecc-2.15.pom b/repository/iaik/prod/iaik_ecc/2.15/iaik_ecc-2.15.pom
new file mode 100644
index 000000000..5e56c24d3
--- /dev/null
+++ b/repository/iaik/prod/iaik_ecc/2.15/iaik_ecc-2.15.pom
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>iaik.prod</groupId>
+  <artifactId>iaik_ecc</artifactId>
+  <version>2.15</version>
+  <description>POM was created from install:install-file</description>
+</project>
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ecc/maven-metadata-local.xml b/repository/iaik/prod/iaik_ecc/maven-metadata-local.xml
new file mode 100644
index 000000000..c9198d1e8
--- /dev/null
+++ b/repository/iaik/prod/iaik_ecc/maven-metadata-local.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>iaik.prod</groupId>
+  <artifactId>iaik_ecc</artifactId>
+  <version>2.15</version>
+  <versioning>
+    <versions>
+      <version>2.15</version>
+    </versions>
+    <lastUpdated>20070814120256</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ixsil/IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.jar b/repository/iaik/prod/iaik_ixsil/IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.jar
new file mode 100644
index 000000000..03ae536db
Binary files /dev/null and b/repository/iaik/prod/iaik_ixsil/IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.jar differ
diff --git a/repository/iaik/prod/iaik_ixsil/IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.jar.md5 b/repository/iaik/prod/iaik_ixsil/IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.jar.md5
new file mode 100644
index 000000000..0c18b2e00
--- /dev/null
+++ b/repository/iaik/prod/iaik_ixsil/IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.jar.md5
@@ -0,0 +1 @@
+0319a9ce27e5f302e4fa2bb46a157074
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ixsil/IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.jar.sha1 b/repository/iaik/prod/iaik_ixsil/IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.jar.sha1
new file mode 100644
index 000000000..b333172ef
--- /dev/null
+++ b/repository/iaik/prod/iaik_ixsil/IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.jar.sha1
@@ -0,0 +1 @@
+e53c644a786eabdaf6b44e4817eb070e86c93cd0
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ixsil/IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.pom b/repository/iaik/prod/iaik_ixsil/IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.pom
new file mode 100644
index 000000000..5030619e4
--- /dev/null
+++ b/repository/iaik/prod/iaik_ixsil/IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.pom
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>iaik.prod</groupId>
+  <artifactId>iaik_ixsil</artifactId>
+  <version>IXSIL-1.2.2.3</version>
+  <description>POM was created from install:install-file</description>
+</project>
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ixsil/IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.pom.md5 b/repository/iaik/prod/iaik_ixsil/IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.pom.md5
new file mode 100644
index 000000000..ba8d6657c
--- /dev/null
+++ b/repository/iaik/prod/iaik_ixsil/IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.pom.md5
@@ -0,0 +1 @@
+ca88fbb4175d09f16753cd4f7108f299
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ixsil/IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.pom.sha1 b/repository/iaik/prod/iaik_ixsil/IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.pom.sha1
new file mode 100644
index 000000000..61535f863
--- /dev/null
+++ b/repository/iaik/prod/iaik_ixsil/IXSIL-1.2.2.3/iaik_ixsil-IXSIL-1.2.2.3.pom.sha1
@@ -0,0 +1 @@
+12953fc15744c95360640cc07e443138cfb69966
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ixsil/maven-metadata-central.xml b/repository/iaik/prod/iaik_ixsil/maven-metadata-central.xml
new file mode 100644
index 000000000..c8d9720de
--- /dev/null
+++ b/repository/iaik/prod/iaik_ixsil/maven-metadata-central.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>iaik.prod</groupId>
+  <artifactId>iaik_ixsil</artifactId>
+  <version>IXSIL-1.2.2.3</version>
+  <versioning>
+    <latest>IXSIL-1.2.2.3</latest>
+    <release>IXSIL-1.2.2.3</release>
+    <versions>
+      <version>IXSIL-1.2.2.3</version>
+    </versions>
+    <lastUpdated>20070814085134</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ixsil/maven-metadata-central.xml.md5 b/repository/iaik/prod/iaik_ixsil/maven-metadata-central.xml.md5
new file mode 100644
index 000000000..95c0475cb
--- /dev/null
+++ b/repository/iaik/prod/iaik_ixsil/maven-metadata-central.xml.md5
@@ -0,0 +1 @@
+2cf7ede94ea6dfeec24b8f5f628eb1c2
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ixsil/maven-metadata-central.xml.sha1 b/repository/iaik/prod/iaik_ixsil/maven-metadata-central.xml.sha1
new file mode 100644
index 000000000..5be514283
--- /dev/null
+++ b/repository/iaik/prod/iaik_ixsil/maven-metadata-central.xml.sha1
@@ -0,0 +1 @@
+1f832641c5999cb9793aabaea88ad45d128285be
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ixsil/maven-metadata.xml b/repository/iaik/prod/iaik_ixsil/maven-metadata.xml
new file mode 100644
index 000000000..c8d9720de
--- /dev/null
+++ b/repository/iaik/prod/iaik_ixsil/maven-metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>iaik.prod</groupId>
+  <artifactId>iaik_ixsil</artifactId>
+  <version>IXSIL-1.2.2.3</version>
+  <versioning>
+    <latest>IXSIL-1.2.2.3</latest>
+    <release>IXSIL-1.2.2.3</release>
+    <versions>
+      <version>IXSIL-1.2.2.3</version>
+    </versions>
+    <lastUpdated>20070814085134</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ixsil/maven-metadata.xml.md5 b/repository/iaik/prod/iaik_ixsil/maven-metadata.xml.md5
new file mode 100644
index 000000000..95c0475cb
--- /dev/null
+++ b/repository/iaik/prod/iaik_ixsil/maven-metadata.xml.md5
@@ -0,0 +1 @@
+2cf7ede94ea6dfeec24b8f5f628eb1c2
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_ixsil/maven-metadata.xml.sha1 b/repository/iaik/prod/iaik_ixsil/maven-metadata.xml.sha1
new file mode 100644
index 000000000..5be514283
--- /dev/null
+++ b/repository/iaik/prod/iaik_ixsil/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+1f832641c5999cb9793aabaea88ad45d128285be
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_jce_full/3.142_MOA/iaik_jce_full-3.142_MOA.jar b/repository/iaik/prod/iaik_jce_full/3.142_MOA/iaik_jce_full-3.142_MOA.jar
new file mode 100644
index 000000000..7288bc39d
Binary files /dev/null and b/repository/iaik/prod/iaik_jce_full/3.142_MOA/iaik_jce_full-3.142_MOA.jar differ
diff --git a/repository/iaik/prod/iaik_jce_full/3.142_MOA/iaik_jce_full-3.142_MOA.jar.md5 b/repository/iaik/prod/iaik_jce_full/3.142_MOA/iaik_jce_full-3.142_MOA.jar.md5
new file mode 100644
index 000000000..990b796e4
--- /dev/null
+++ b/repository/iaik/prod/iaik_jce_full/3.142_MOA/iaik_jce_full-3.142_MOA.jar.md5
@@ -0,0 +1 @@
+c78f934b46ed4fcdc57807496d756d60
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_jce_full/3.142_MOA/iaik_jce_full-3.142_MOA.jar.sha1 b/repository/iaik/prod/iaik_jce_full/3.142_MOA/iaik_jce_full-3.142_MOA.jar.sha1
new file mode 100644
index 000000000..a29e73055
--- /dev/null
+++ b/repository/iaik/prod/iaik_jce_full/3.142_MOA/iaik_jce_full-3.142_MOA.jar.sha1
@@ -0,0 +1 @@
+79fd66f6969bbcd5ea7c96163bb86b1790ccfde1
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_jce_full/3.142_MOA/iaik_jce_full-3.142_MOA.pom b/repository/iaik/prod/iaik_jce_full/3.142_MOA/iaik_jce_full-3.142_MOA.pom
new file mode 100644
index 000000000..cd5e49bc3
--- /dev/null
+++ b/repository/iaik/prod/iaik_jce_full/3.142_MOA/iaik_jce_full-3.142_MOA.pom
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>iaik.prod</groupId>
+  <artifactId>iaik_jce_full</artifactId>
+  <version>3.142_MOA</version>
+  <description>POM was created from install:install-file</description>
+</project>
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_jce_full/3.142_MOA/iaik_jce_full-3.142_MOA.pom.md5 b/repository/iaik/prod/iaik_jce_full/3.142_MOA/iaik_jce_full-3.142_MOA.pom.md5
new file mode 100644
index 000000000..ad09e7e62
--- /dev/null
+++ b/repository/iaik/prod/iaik_jce_full/3.142_MOA/iaik_jce_full-3.142_MOA.pom.md5
@@ -0,0 +1 @@
+129227c823c9c03e6620f4bdc30991f9
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_jce_full/3.142_MOA/iaik_jce_full-3.142_MOA.pom.sha1 b/repository/iaik/prod/iaik_jce_full/3.142_MOA/iaik_jce_full-3.142_MOA.pom.sha1
new file mode 100644
index 000000000..496dbe4d6
--- /dev/null
+++ b/repository/iaik/prod/iaik_jce_full/3.142_MOA/iaik_jce_full-3.142_MOA.pom.sha1
@@ -0,0 +1 @@
+38e98211d8f9c64c6768c9be9d37652dee2cf3c4
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_jce_full/maven-metadata-central.xml b/repository/iaik/prod/iaik_jce_full/maven-metadata-central.xml
new file mode 100644
index 000000000..809243838
--- /dev/null
+++ b/repository/iaik/prod/iaik_jce_full/maven-metadata-central.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>iaik.prod</groupId>
+  <artifactId>iaik_jce_full</artifactId>
+  <version>3.142_MOA</version>
+  <versioning>
+    <latest>3.142_MOA</latest>
+    <release>3.142_MOA</release>
+    <versions>
+      <version>3.142_MOA</version>
+    </versions>
+    <lastUpdated>20070814085134</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_jce_full/maven-metadata-central.xml.md5 b/repository/iaik/prod/iaik_jce_full/maven-metadata-central.xml.md5
new file mode 100644
index 000000000..6b82bce5a
--- /dev/null
+++ b/repository/iaik/prod/iaik_jce_full/maven-metadata-central.xml.md5
@@ -0,0 +1 @@
+be9deda114cc93cf8a834062811cf11f
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_jce_full/maven-metadata-central.xml.sha1 b/repository/iaik/prod/iaik_jce_full/maven-metadata-central.xml.sha1
new file mode 100644
index 000000000..6ff869214
--- /dev/null
+++ b/repository/iaik/prod/iaik_jce_full/maven-metadata-central.xml.sha1
@@ -0,0 +1 @@
+243eff519b9cb4460f68c1ad4f29118a22c56aad
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_jce_full/maven-metadata.xml b/repository/iaik/prod/iaik_jce_full/maven-metadata.xml
new file mode 100644
index 000000000..809243838
--- /dev/null
+++ b/repository/iaik/prod/iaik_jce_full/maven-metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>iaik.prod</groupId>
+  <artifactId>iaik_jce_full</artifactId>
+  <version>3.142_MOA</version>
+  <versioning>
+    <latest>3.142_MOA</latest>
+    <release>3.142_MOA</release>
+    <versions>
+      <version>3.142_MOA</version>
+    </versions>
+    <lastUpdated>20070814085134</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_jce_full/maven-metadata.xml.md5 b/repository/iaik/prod/iaik_jce_full/maven-metadata.xml.md5
new file mode 100644
index 000000000..6b82bce5a
--- /dev/null
+++ b/repository/iaik/prod/iaik_jce_full/maven-metadata.xml.md5
@@ -0,0 +1 @@
+be9deda114cc93cf8a834062811cf11f
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_jce_full/maven-metadata.xml.sha1 b/repository/iaik/prod/iaik_jce_full/maven-metadata.xml.sha1
new file mode 100644
index 000000000..6ff869214
--- /dev/null
+++ b/repository/iaik/prod/iaik_jce_full/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+243eff519b9cb4460f68c1ad4f29118a22c56aad
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_moa/1.20/iaik_moa-1.20.jar b/repository/iaik/prod/iaik_moa/1.20/iaik_moa-1.20.jar
new file mode 100644
index 000000000..35ffc2d06
Binary files /dev/null and b/repository/iaik/prod/iaik_moa/1.20/iaik_moa-1.20.jar differ
diff --git a/repository/iaik/prod/iaik_moa/1.20/iaik_moa-1.20.jar.md5 b/repository/iaik/prod/iaik_moa/1.20/iaik_moa-1.20.jar.md5
new file mode 100644
index 000000000..b9a770d4d
--- /dev/null
+++ b/repository/iaik/prod/iaik_moa/1.20/iaik_moa-1.20.jar.md5
@@ -0,0 +1 @@
+dd2fdee0d669d8dcdeea44deb12c6ee0
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_moa/1.20/iaik_moa-1.20.jar.sha1 b/repository/iaik/prod/iaik_moa/1.20/iaik_moa-1.20.jar.sha1
new file mode 100644
index 000000000..6f50f44a8
--- /dev/null
+++ b/repository/iaik/prod/iaik_moa/1.20/iaik_moa-1.20.jar.sha1
@@ -0,0 +1 @@
+b5c33e3338f17cdd76145bf5b17b73d266f08a3c
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_moa/1.20/iaik_moa-1.20.pom b/repository/iaik/prod/iaik_moa/1.20/iaik_moa-1.20.pom
new file mode 100644
index 000000000..0126105c7
--- /dev/null
+++ b/repository/iaik/prod/iaik_moa/1.20/iaik_moa-1.20.pom
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>iaik.prod</groupId>
+  <artifactId>iaik_moa</artifactId>
+  <version>1.20</version>
+  <description>POM was created from install:install-file</description>
+</project>
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_moa/1.20/iaik_moa-1.20.pom.md5 b/repository/iaik/prod/iaik_moa/1.20/iaik_moa-1.20.pom.md5
new file mode 100644
index 000000000..dad6fa5e4
--- /dev/null
+++ b/repository/iaik/prod/iaik_moa/1.20/iaik_moa-1.20.pom.md5
@@ -0,0 +1 @@
+db8686970a65ac648a6635661e595e43
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_moa/1.20/iaik_moa-1.20.pom.sha1 b/repository/iaik/prod/iaik_moa/1.20/iaik_moa-1.20.pom.sha1
new file mode 100644
index 000000000..d1450b924
--- /dev/null
+++ b/repository/iaik/prod/iaik_moa/1.20/iaik_moa-1.20.pom.sha1
@@ -0,0 +1 @@
+7aa8aade99c6ebd395f714cb7d13a8d6de8a366f
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_moa/maven-metadata-central.xml b/repository/iaik/prod/iaik_moa/maven-metadata-central.xml
new file mode 100644
index 000000000..a1683d4b0
--- /dev/null
+++ b/repository/iaik/prod/iaik_moa/maven-metadata-central.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>iaik.prod</groupId>
+  <artifactId>iaik_moa</artifactId>
+  <version>1.20</version>
+  <versioning>
+    <latest>1.20</latest>
+    <release>1.20</release>
+    <versions>
+      <version>1.20</version>
+    </versions>
+    <lastUpdated>20070814085134</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_moa/maven-metadata-central.xml.md5 b/repository/iaik/prod/iaik_moa/maven-metadata-central.xml.md5
new file mode 100644
index 000000000..07e55cde3
--- /dev/null
+++ b/repository/iaik/prod/iaik_moa/maven-metadata-central.xml.md5
@@ -0,0 +1 @@
+0c076e1e4014632478fb86a19831bb71
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_moa/maven-metadata-central.xml.sha1 b/repository/iaik/prod/iaik_moa/maven-metadata-central.xml.sha1
new file mode 100644
index 000000000..11a7aa442
--- /dev/null
+++ b/repository/iaik/prod/iaik_moa/maven-metadata-central.xml.sha1
@@ -0,0 +1 @@
+5c4e79e6e84c6b376269ef07ba149552d865feea
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_moa/maven-metadata.xml b/repository/iaik/prod/iaik_moa/maven-metadata.xml
new file mode 100644
index 000000000..a1683d4b0
--- /dev/null
+++ b/repository/iaik/prod/iaik_moa/maven-metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>iaik.prod</groupId>
+  <artifactId>iaik_moa</artifactId>
+  <version>1.20</version>
+  <versioning>
+    <latest>1.20</latest>
+    <release>1.20</release>
+    <versions>
+      <version>1.20</version>
+    </versions>
+    <lastUpdated>20070814085134</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_moa/maven-metadata.xml.md5 b/repository/iaik/prod/iaik_moa/maven-metadata.xml.md5
new file mode 100644
index 000000000..07e55cde3
--- /dev/null
+++ b/repository/iaik/prod/iaik_moa/maven-metadata.xml.md5
@@ -0,0 +1 @@
+0c076e1e4014632478fb86a19831bb71
\ No newline at end of file
diff --git a/repository/iaik/prod/iaik_moa/maven-metadata.xml.sha1 b/repository/iaik/prod/iaik_moa/maven-metadata.xml.sha1
new file mode 100644
index 000000000..11a7aa442
--- /dev/null
+++ b/repository/iaik/prod/iaik_moa/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+5c4e79e6e84c6b376269ef07ba149552d865feea
\ No newline at end of file
diff --git a/spss/assembly.xml b/spss/assembly.xml
new file mode 100644
index 000000000..998a0d0e4
--- /dev/null
+++ b/spss/assembly.xml
@@ -0,0 +1,207 @@
+<assembly>
+	<id>SPSS</id>
+
+	<formats>
+		<format>zip</format>
+	</formats>
+
+	<includeBaseDirectory>false</includeBaseDirectory>
+
+	<moduleSets>
+		<moduleSet>
+			<includes>
+				<include>MOA.spss.server:moa-spss-ws</include>
+			</includes>
+			<binaries>
+				<includeDependencies>true</includeDependencies>
+				<dependencySets>
+					<dependencySet>
+						<includes>
+							<include>xalan:xalan</include>
+							<include>xerces:xercesImpl</include>
+							<include>xerces:xmlParserAPIs</include>
+						</includes>
+						<outputDirectory>/endorsed</outputDirectory>
+					</dependencySet>
+					<dependencySet>
+						<includes>
+							<include>iaik.prod:iaik_ecc</include>
+							<include>iaik.prod:iaik_jce_full</include>
+							<include>iaik.prod:iaik_Pkcs11Provider</include>
+							<include>iaik.prod:iaik_Pkcs11Wrapper</include>
+						</includes>
+						<outputDirectory>/ext</outputDirectory>
+					</dependencySet>
+					<dependencySet>
+						<includes>
+							<include>iaik.prod:iaik_Pkcs11Wrapper</include>
+						</includes>
+						<outputDirectory>/pkcs11/win32</outputDirectory>
+						<outputFileNameMapping>pkcs11wrapper.dll</outputFileNameMapping>
+					</dependencySet>
+				</dependencySets>
+				<outputFileNameMapping>moa-spss.${extension}</outputFileNameMapping>
+				<unpack>false</unpack>
+			</binaries>
+		</moduleSet>
+		<moduleSet>
+			<includes>
+				<include>MOA.spss.server:moa-spss-lib</include>
+			</includes>
+			<binaries>
+				<attachmentClassifier>javadoc</attachmentClassifier>
+				<includeDependencies>false</includeDependencies>
+				<outputFileNameMapping>api-doc</outputFileNameMapping>
+				<outputDirectory>/doc</outputDirectory>
+				<unpack>true</unpack>
+			</binaries>
+		</moduleSet>
+		<moduleSet>
+			<includes>
+				<include>MOA.spss.server:moa-spss-tools</include>
+			</includes>
+			<binaries>
+				<includeDependencies>true</includeDependencies>
+				<dependencySets>
+					<dependencySet>
+						<includes>
+							<include>iaik.prod:iaik_moa</include>
+							<include>log4j:log4j</include>
+							<include>xalan:xalan</include>
+						</includes>
+						<outputDirectory>/tools</outputDirectory>
+					</dependencySet>
+				</dependencySets>
+				<outputDirectory>/tools</outputDirectory>
+				<outputFileNameMapping>tools.${extension}</outputFileNameMapping>
+				<unpack>false</unpack>
+			</binaries>
+		</moduleSet>
+	</moduleSets>
+	
+	<files>
+		<file>
+			<source>${basedir}/spss/handbook/handbook.html</source>
+			<outputDirectory>/doc</outputDirectory>
+		</file>
+	</files>
+	
+	<fileSets>
+		<fileSet>
+			<directory>${basedir}/spss/server</directory>
+			<outputDirectory>/</outputDirectory>
+			<includes>
+				<include>*.txt</include>
+			</includes>
+			<excludes>
+				<exclude>readme.src.txt</exclude>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/spss/handbook/conf</directory>
+			<outputDirectory>/conf</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/spss/handbook/handbook</directory>
+			<outputDirectory>/doc/handbook</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/spss/handbook/clients</directory>
+			<outputDirectory>/doc/clients</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/spss/server/serverlib/resources/licenses</directory>
+			<outputDirectory>/licenses</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/spss/server/serverws/data/deploy/tomcat</directory>
+			<outputDirectory>/tomcat</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/spss/server/serverws/data/deploy/tools</directory>
+			<outputDirectory>/tools</outputDirectory>
+		</fileSet>
+	</fileSets>
+	
+	<!--
+	
+	
+	<files>
+		<file>
+			<source>${basedir}/../handbook/handbook.html</source>
+			<outputDirectory>/doc</outputDirectory>
+		</file>
+	</files>
+	
+	<fileSets>
+		<fileSet>
+			<directory>${basedir}/../../handbook/conf</directory>
+			<outputDirectory>/conf</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/../../handbook/handbook</directory>
+			<outputDirectory>/doc/handbook</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/../../handbook/clients</directory>
+			<outputDirectory>/doc/clients</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/../serverlib/resources/licenses</directory>
+			<outputDirectory>/licenses</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/../serverws/data/deploy/tomcat</directory>
+			<outputDirectory>/tomcat</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/../serverws/target</directory>
+			<outputDirectory>/</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/../serverws/data/deploy/tools</directory>
+			<outputDirectory>/tools</outputDirectory>
+		</fileSet>
+	</fileSets>
+
+	<dependencySets>
+		<dependencySet>
+			<includes>
+				<include>MOA.ssps.server:serverwebasdfasdf</include>
+			</includes>
+		</dependencySet>
+		<dependencySet>
+			<includes>
+				<include>xalan:xalan</include>
+				<include>xerces:xercesImpl</include>
+				<include>xerces:xmlParserAPIs</include>
+			</includes>
+			<outputDirectory>/endorsed</outputDirectory>
+		</dependencySet>
+		<dependencySet>
+			<includes>
+				<include>iaik.prod:iaik_ecc</include>
+				<include>iaik.prod:iaik_jce_full</include>
+				<include>iaik.prod:iaik_Pkcs11Provider</include>
+			</includes>
+			<outputDirectory>/ext</outputDirectory>
+		</dependencySet>
+		<dependencySet>
+			<includes>
+				<include>iaik.win32:Pkcs11Wrapper</include>
+			</includes>
+			<outputDirectory>/pkcs11/win32</outputDirectory>
+		</dependencySet>
+		<dependencySet>
+			<includes>
+				<include>iaik.prod:iaik_ecc</include>
+				<include>iaik.prod:iaik_jce_full</include>
+				<include>iaik.prod:iaik_moa_full</include>
+				<include>log4j:log4j</include>
+				<include>xalan:xalan</include>
+			</includes>
+			<outputDirectory>/tools</outputDirectory>
+		</dependencySet>
+	</dependencySets>
+
+--></assembly>
\ No newline at end of file
diff --git a/spss/pom.xml b/spss/pom.xml
index 93a5b4374..c533b8153 100644
--- a/spss/pom.xml
+++ b/spss/pom.xml
@@ -1,222 +1,24 @@
-<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</groupId>
-		<artifactId>MOA</artifactId>
-		<version>1.4.0</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>MOA</groupId>
-  <artifactId>spss</artifactId>
-  <packaging>pom</packaging>
-  <version>1.4.0</version>
-  <name>MOA spss</name>
-
-  <properties>
-  	<thirdPartyLib>${basedir}/../buildhelper</thirdPartyLib>
-  </properties>
-
- <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <verbose>false</verbose>
-          <fork>true</fork>
-          <executable>${env.BUILD_EXECUTEABLE}</executable>
-          <compilerVersion>${env.BUILD_VERSION}</compilerVersion>
-          <source>1.3</source>
-          <target>1.3</target>
-        </configuration>
-      </plugin>
-    </plugins>
- </build>
-
-	<modules>
-		<module>server</module>
-	</modules>
-
-  <dependencyManagement>
-  <dependencies>
-    <dependency>
-      <groupId>axis</groupId>
-      <artifactId>axis</artifactId>
-      <version>1.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.0.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>iDoclet</groupId>
-      <artifactId>iDoclet</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>jaxen</groupId>
-      <artifactId>jaxen</artifactId>
-      <version>1.0-FCS</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>jaxen</groupId>
-      <artifactId>jaxen-core</artifactId>
-      <version>1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>jaxen</groupId>
-      <artifactId>jaxen-dom</artifactId>
-      <version>1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.xml</groupId>
-      <artifactId>jaxrpc-api</artifactId>
-      <version>1.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>javaext</groupId>
-      <artifactId>jaxrpc</artifactId>
-      <version>0.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.w3c.dom</groupId>
-      <artifactId>dom</artifactId>
-      <version>LEVEL_3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>sax</groupId>
-      <artifactId>sax</artifactId>
-      <version>JDK_13</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>saxpath</groupId>
-      <artifactId>saxpath</artifactId>
-      <version>1.0-FCS</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>wsdl4j</groupId>
-      <artifactId>wsdl4j</artifactId>
-      <version>1.4</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.7</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>postgresql</groupId>
-      <artifactId>postgresql</artifactId>
-      <version>7.3-jdbc2</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>xalan</groupId>
-      <artifactId>xalan</artifactId>
-      <version>2.5.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.4.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xmlParserAPIs</artifactId>
-      <version>2.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_cms</artifactId>
-      <version>3.2</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_jce_full</artifactId>
-      <version>3.142_MOA</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_Pkcs11Provider</artifactId>
-      <version>1.2.4</version>
-      <scope>provided</scope>
-    </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_ecc_signed</artifactId>
-      <version>2.15</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_jce_full_signed</artifactId>
-      <version>3.142_MOA</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_Pkcs11Provider_signed</artifactId>
-      <version>1.2.4</version>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>iaik.win32</groupId>
-      <artifactId>Pkcs11Wrapper</artifactId>
-      <type>dll</type>
-      <version>1.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>MOA</groupId>
-      <artifactId>common</artifactId>
-      <version>1.4.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>MOA</groupId>
-      <artifactId>common-test</artifactId>
-      <version>1.4.0</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  </dependencyManagement>
-	
-</project>
+<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</groupId>
+        <artifactId>MOA</artifactId>
+        <version>1.4.0</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>MOA</groupId>
+    <artifactId>spss</artifactId>
+    <packaging>pom</packaging>
+    <version>1.4.0</version>
+    <name>MOA SP/SS</name>
+
+    <properties>
+        <repositoryPath>${basedir}/../repository</repositoryPath>
+    </properties>
+
+    <modules>
+        <module>server</module>
+    </modules>
+
+</project>
diff --git a/spss/server/distribution/assembly.xml b/spss/server/distribution/assembly.xml
deleted file mode 100644
index b646f58b2..000000000
--- a/spss/server/distribution/assembly.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<assembly>
-	<id>all</id>
-
-	<formats>
-		<format>zip</format>
-	</formats>
-
-	<files>
-		<file>
-			<source>${basedir}/../../handbook/handbook.html</source>
-			<outputDirectory>/doc</outputDirectory>
-		</file>
-	</files>
-	
-	<fileSets>
-		<fileSet>
-			<directory>${basedir}/../../handbook/conf</directory>
-			<outputDirectory>/conf</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../../handbook/handbook</directory>
-			<outputDirectory>/doc/handbook</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../../handbook/clients</directory>
-			<outputDirectory>/doc/clients</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../serverlib/resources/licenses</directory>
-			<outputDirectory>/licenses</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../serverws/data/deploy/tomcat</directory>
-			<outputDirectory>/tomcat</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../serverws/target</directory>
-			<outputDirectory>/</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../serverws/data/deploy/tools</directory>
-			<outputDirectory>/tools</outputDirectory>
-		</fileSet>
-	</fileSets>
-
-	<dependencySets>
-		<dependencySet>
-			<includes>
-				<include>xalan:xalan</include>
-				<include>xerces:xercesImpl</include>
-				<include>xerces:xmlParserAPIs</include>
-			</includes>
-			<outputDirectory>/endorsed14</outputDirectory>
-		</dependencySet>
-		<dependencySet>
-			<includes>
-				<include>iaik.prod:iaik_ecc</include>
-				<include>iaik.prod:iaik_jce_full</include>
-				<include>iaik.prod:iaik_Pkcs11Provider</include>
-				<include>jsse:jcert</include>
-				<include>jsse:jnet</include>
-				<include>jsse:jsse</include>
-			</includes>
-			<outputDirectory>/ext13</outputDirectory>
-		</dependencySet>
-		<dependencySet>
-			<includes>
-				<include>iaik.prod:iaik_ecc_signed</include>
-				<include>iaik.prod:iaik_jce_full_signed</include>
-				<include>iaik.prod:iaik_Pkcs11Provider_signed</include>
-			</includes>
-			<outputDirectory>/ext14</outputDirectory>
-		</dependencySet>
-		<dependencySet>
-			<includes>
-				<include>iaik.win32:Pkcs11Wrapper</include>
-			</includes>
-			<outputDirectory>/pkcs11/win32</outputDirectory>
-		</dependencySet>
-		<dependencySet>
-			<includes>
-				<include>iaik.prod:iaik_ecc</include>
-				<include>iaik.prod:iaik_jce_full</include>
-				<include>iaik.prod:iaik_moa_full</include>
-				<include>log4j:log4j</include>
-				<include>xalan:xalan</include>
-			</includes>
-			<outputDirectory>/tools</outputDirectory>
-		</dependencySet>
-	</dependencySets>
-
-</assembly>
\ No newline at end of file
diff --git a/spss/server/distribution/pom.xml b/spss/server/distribution/pom.xml
deleted file mode 100644
index bf31f7128..000000000
--- a/spss/server/distribution/pom.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<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.spss</groupId>
-		<artifactId>server</artifactId>
-		<version>1.4.0</version>
-	</parent>  
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>MOA.spss</groupId>
-  <artifactId>server.distribution</artifactId>
-  <packaging>pom</packaging>
-  <version>1.4.0</version>
-  <name>SPSS-Server-Distribution</name>
-  
-  <properties>
-  	<thirdPartyLib>${basedir}/../../../buildhelper</thirdPartyLib>
-  </properties>
-  
-	<build>
-	<plugins>
-		<plugin>
-			<artifactId>maven-assembly-plugin</artifactId>
-			<configuration>
-				<descriptors>
-					<descriptor>./assembly.xml</descriptor>
-				</descriptors>
-			</configuration>
-			<executions>
-				<execution>
-					<id>make-dist-standalone</id>
-					<phase>package</phase>
-					<goals>
-						<goal>attached</goal>
-					</goals>
-				</execution>
-			</executions>
-		</plugin>
-		</plugins>
-	</build>
-	
-	<dependencies>
-    <dependency>
-      <groupId>xalan</groupId>
-      <artifactId>xalan</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xmlParserAPIs</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_ecc</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_jce_full</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_Pkcs11Provider</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_ecc</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_jce_full</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_Pkcs11Provider</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.win32</groupId>
-      <artifactId>Pkcs11Wrapper</artifactId>
-      <type>dll</type>
-      <version>1.0</version>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jcert</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jnet</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jsse</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-	</dependencies>
-</project>
\ No newline at end of file
diff --git a/spss/server/history.txt b/spss/server/history.txt
new file mode 100644
index 000000000..8bcef8aba
--- /dev/null
+++ b/spss/server/history.txt
@@ -0,0 +1,268 @@
+##############
+1.4.0
+##############
+
+- Unterstützung von SOAP with Attachments. LocRefContent kann nun auch über SOAP 
+  attachments übergeben werden. Dadurch können alle notwendigen Teile für einen 
+  Request platzsparend in einem Schritt übermittelt werden.
+  
+- Axis Libraries aktualisiert (auf Version 1.4)
+
+- Ermöglichung von Signaturpositionen die sich am Ende des Dokuments befinden 
+  (CreateSignatureLocation=-1).
+  
+- IAIK Libraries aktualisiert:
+	   Versionsnummern:
+	     iaik-jce:           Version 3.142_MOA
+	     iaik-cms:           Version 3.2
+	     iaikPkcs11Provider: Version 1.2.4
+	     iaikPkcs11Wrapper:	 Version 1.2.16
+	     ixsil:			         Version IXSIL-1.2.2.1
+	     ecc:			           Version v2.15
+	     iaik-moa:           Version 1.20
+	     
+- Neue Mindestanforderung an Java: Version 1.4.0 (1.3.* wird nicht mehr unterstützt)
+
+##############
+1.3.1D01
+##############
+
+- IAIK-MOA: CRL wird nun auch akzeptiert, wenn im CLRSigner-Zertifikat KeyUsage
+            crlSign-Bit nicht gesetzt ist, allerdings nur wenn das Zertifikat 
+            ein Trust-Anchor ist.
+- IAIK-MOA: Eine indirekte CRL wird nun auch akzeptiert, wenn die 
+            "IssuingDistributionPoint"-Extension fehlt 
+            
+- Logging: commons-logging-1.0.4-Libraries (unterstützt auch Tomcat 5*)
+
+##############
+1.3.0
+##############
+
+- "E-CARD"-Release
+- Update der Zertifikatsspeicher und Trustprofile
+- Update PKI auf OCSP (auch schon in 1.3.0D01 enthalten)
+- Update IAIK-Libraries (ab sofort wieder in der Distribution enthalten)
+	Versionsnummern:
+		iaik-jce: 			Version 3.13_3.13_NONEwithRSA (MOA-ID kann nun auch mit JDK1.5 
+		                verwendet werden)
+  	iaik-cms:				Version 3.2
+  	iaikPkcs11Provider:	Version 1.1.9
+  	iaikPkcs11Wrapper:	Version 1.2.14
+  	ixsil:				Version IXSIL-1_2_2
+  	ecc:					Version 2.0
+
+##############
+1.3.0D01
+##############
+
+- Default-Wert für Archivierungsdauer von Widerrufsinformation von 0 auf 365
+  Tage geändert.
+  Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=305.
+
+- Default-Reihenfolge der Verwendung von Widerrufspunkten von (CRL, OCSP) auf
+  (OCSP, CRL) geändert.
+  Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=304.
+
+- XML-Schema für die Konfiguration von MOA SP/SS komplett überarbeitet.
+  Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=271.
+
+- Änderungen der Semantik des Elements VerifyXMLSignatureRequest/ReturnHashInputData
+  bzw. des Attributs VerifyXMLSignatureRequest/SignatureManifestCheckParams/
+  @ReturnReferenceInputData. Es werden nunmehr auch die Hash-Eingangsdaten bzw.
+  die Referenz-Eingangsdaten für dsig:Reference-Elemente in XMLDSIG-Manifesten
+  zurückgeliefert.
+  Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=232.
+
+- TCP-Verbindungen zur Auflösung von externen Referenzen wurden bisher nicht 
+  sauber geschlossen. Damit kam es bei sehr komplexen XML-Signaturen unter
+  Umständen zu einem Ressourcen-Problem, da zu viele TCP-Verbindungen gleich-
+  zeitig geöffnet wurden. Dieses Probem wurde behoben.
+  Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=283.
+
+- Trustprofil um eine Menge explizit erlaubter Signatorzertifikate erweitert.
+  Dadurch ist es nun möglich, nicht nur generell allen von einer als Vertrauens-
+  anker gesetzten CA ausgestellten Zertifikate zu vertrauen, sondern diese Zerti-
+  fikate weiter auf eine taxativ aufgezählte Liste von Signatorzertifikaten ein-
+  zuschränken.
+  Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=267.
+
+- MOA SS Webservice Clients, die sich mit einem Zertifikat ausweisen, können nun
+  auch auf die Key-Groups des anonymen Key-Group-Mappings zugreifen.
+  Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=224.
+
+- MOA SS fit für Mehrfachsignaturen, d.h. mehrere XML-Signaturen in einem XML-
+  Dokument gemacht. Bisher scheiterte das an den fix vergebenen Id-Attributen
+  innerhalb der dsig:Signature-Struktur.
+  Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=214.
+  
+- MOA SP so verändert, dass die Prüfungen zum Signaturmanifest laut SL 1.2 jeden-
+  falls durchgeführt werden, auch wenn das Element SignatureManifestCheckParams
+  in VerifyXMLSignatureRequest nicht angegeben wird.
+  Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=269. 
+
+- Verwendete JSSE Bibliothek auf Version 1.0.3 aktualisiert, da frühere Versionen
+  einen sicherheitskritischen Fehler enthalten.
+  Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=124.   
+
+##############
+1.2.1
+##############
+
+- Packaging umgestellt. Ab dieser Release werden die Kryptographiebibliotheken
+  des IAIK nicht mehr mit den Distributionen von MOA SP/SS mitgeliefert, sondern
+  sind vom Kunden selbst zu besorgen.
+
+##############
+1.2.0
+##############
+
+- Fehler beim validierenden Parsen des SignatureEnvironments eines Signaturer-
+  stellungsrequests behoben. War das Debug-Level ungleich debug, kam es bisher
+  zu einem Fehler.
+  Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=220.
+  
+- Default-Wert für das Konfigurationsattribut cfg:CRLDistributionPoint/
+  cfg:DistributionPoint/@reasonCodes so verändert, dass bei Weglassen des
+  Attributs alle Reason-Codes gesetzt werden.
+  Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=244. 
+  
+- Commons Logging Bibliothek auf die Version 1.0.4 aktualisiert, damit Logging
+  auch beim Betrieb unter Tomcat 5 funktioniert.
+  Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=245.
+  
+- Werden bei der Zusammenstellung eines Signaturprüfrequests über das MOA API
+  keine Supplements angegeben (null), kommt es nunmehr zu keinem Fehler mehr.
+  Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=247.    
+
+##############
+1.2.0D04
+##############
+
+- Update des MOA-Kerns von IAIK. Gepatched wurde darin die fehlerhafte Kodierung
+  des Signaturwerts für ECDSA-Signaturen. Bisher wurde das Paar (r,s) fehlerhafter
+  Weise in eine ASN.1-Struktur eingepackt.
+  Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=218. 
+
+##############
+1.2.0D03
+##############
+
+- Update auf eine neuere Version der XML-Signaturbibliothek sowie damit ver-
+  bunden ein Update auf neuere Versionen von Xalan (2.5.1) sowie Xerces (2.4.0).
+  Grund: Mit der neuen Xerces-Version funktioniert nun auch das Parsen einer
+  XML-Personenbindung mit ECDSA-Schlüsseln.
+  Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=215.
+  
+- Update des MOA-Kerns von IAIK. Es werden nun ECDSA-Signaturen, welche den
+  Signaturalgorithmus mit "http://www.w3.org/2004/01/xmldsig-more#"
+  kennzeichnen, erfolgreich von MOA SP erkannt und geprüft. Ebenso erstellt
+  MOA SP nun ECDSA-Signaturen mit dem erwähnten Signaturalgorithmus.
+  Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=217.  
+
+- Prüfung des Signaturmanifests funktioniert nun auch bei vorhandener EC14N
+  Transformation. Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=197.
+
+- Das Element SignerInfo/QualifiedCertificate der Antwort auf eine XML-
+  Signaturprüfung erscheint nun im korrekten Namespace.
+  Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=189.
+
+- Eine falsche Fehlermeldung im Zusammenhang mit Ergänzungsobjekten wurde
+  korrigiert. Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=174.
+
+- Fehlender Typ des Elements TrustProfileID im XML-Schema wurde ergänzt.
+  Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=163.
+
+- Stack Overflow bei Prüfung bestimmter XML-Signaturen tritt nun nicht mehr
+  auf. Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=132.
+
+- Unpräzise Fehlermeldungen verbessert.
+  Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=127.
+  Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=74.
+
+
+##############
+1.2.0D02
+##############
+
+- Im Befehl CreateXMLSignatureRequest kann nun in FinalDataMetaInfo das 
+  zusätzliche Element "Type" angegeben werden. Der Textinhalt dieses Elements
+  wird als Type-Attribut der korrespondierenden dsig:Reference gesetzt. Siehe
+  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=54.
+  
+- Die Verwendung von EC14N-Transformationen ohne InclusiveNamespaces funktioniert
+  nun auch. Siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=44.  
+  
+- Signaturerstellung mit DSA-Schlüssel funktioniert nun. Siehe
+  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=52.  
+
+##############
+1.2.0D01
+##############
+
+- In den Befehlen CreateXMLSignatureRequest sowie VerifyXMLSignatureRequest kann
+  nun in allen Fällen, in denen bisher entweder Base64Content oder XMLContent 
+  angegeben werden konnte, auch eine dritte Spielart verwendet werden, nämlich
+  LocRefContent. LocRefContent hat als Text-Inhalt eine URL, von der MOA den
+  Content bezieht
+  (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=41).
+
+##############
+1.1.0
+##############
+
+- Einfach verwendbare Scripts für Starten/Stopen sowie Install/Uninstall als
+  Service unter Windows in die Auslieferung aufgenommen 
+  (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=36).
+
+- Drei neue Fragen in die FAQ aufgenommen
+  (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=34,
+  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=35,
+  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=37).
+
+- Zertifikatsspeicher der Default-Konfiguration enthält nun alle CA-Zertifikate 
+  A-Trust sowie das Root-Zertifikats des Mobilkom-Bürgerkarten-Versuchs
+  (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=33).
+
+- Konfigurationsparameter "checkRevocation" ist hat nun Default-Wert "false"
+  (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=32).
+
+- Fehlerhafte Einträge in den minimalen Default-Konfigurationsfiles behoben
+  (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=30,
+  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=31).
+
+- Ein CreateXMLSignatureRequest, der nicht den Default-Namespace verwendet, sondern
+  ein ns-Präfix verwendet, wird nun auch korrekt verarbeitet
+  (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=19).
+
+- Wird eine Enveloped Signature erzeugt, wird nun das korrekte XML-Dokument mit der
+  erzeugten Signatur in der Antwort zurückgeliefert 
+  (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=12).
+
+- WSDL-File, das über die URI <MOA-SPSS-Basis-URL>/services/SignatureCreation?wsdl 
+  bzw. <MOA-SPSS-Basis-URL>/services/SignatureVerification?wsdl abgefragt werden 
+  kann, ist nun aktuell (MOA-SPSS-Schema 1.1) und enthält einen korrekten Verweis
+  auf das MOA-SPSS-Schema 1.1 
+  (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=6).
+
+- Problem mit Auflösung von LDAP-URLs beim Einsatz als Webservice in Tomcat behoben. 
+  (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=2).
+
+- Bei der Prüfung auf Security-Layer-Konformität wird nun das korrekte Resultat
+  zurückgeliefert, wenn die Signatur keine impliziten Transformationsparameter 
+  enthält
+  (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=3).
+
+- Unterstützung anderer Datenbanken als postgreSQL und mySQL für das CRL-Archiv
+  (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=7).
+
+- Diverse Fehler in der Dokumentation beseitigt 
+  (siehe https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=8,
+  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=9,
+  https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=29).  
+
+##############
+1.0.9
+##############
+
+- Erste öffentliche Release
diff --git a/spss/server/pom.xml b/spss/server/pom.xml
index 0b71ea208..360949903 100644
--- a/spss/server/pom.xml
+++ b/spss/server/pom.xml
@@ -1,26 +1,26 @@
-<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</groupId>
-		<artifactId>spss</artifactId>
-		<version>1.4.0</version>
-  </parent>
+<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</groupId>
+        <artifactId>spss</artifactId>
+        <version>1.4.0</version>
+    </parent>
 
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>MOA.spss</groupId>
-  <artifactId>server</artifactId>
-  <packaging>pom</packaging>
-  <version>1.4.0</version>
-  <name>MOA spss Server</name>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>MOA.spss</groupId>
+    <artifactId>moa-spss</artifactId>
+    <packaging>pom</packaging>
+    <version>1.4.0</version>
+    <name>MOA SPSS Server</name>
 
-  <properties>
-  	<thirdPartyLib>${basedir}/../../buildhelper</thirdPartyLib>
-  </properties>
-  
- 	<modules>
-		<module>serverlib</module>
-		<module>serverws</module>
-		<module>distribution</module>
-	</modules>
-	
+    <modules>
+        <module>serverlib</module>
+        <module>serverws</module>
+        <module>tools</module>
+    </modules>
+
+    <properties>
+        <repositoryPath>${basedir}/../../repository</repositoryPath>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/spss/server/readme.inst.txt b/spss/server/readme.inst.txt
new file mode 100644
index 000000000..a8b181cd8
--- /dev/null
+++ b/spss/server/readme.inst.txt
@@ -0,0 +1,56 @@
+Willkommen zur Installation von MOA SP/SS!
+
+Für eine Anleitung zur Installation verwenden Sie bitte das 
+Installationshandbuch "handbook.html" im Verzeichnis "doc" dieser
+Distribution.
+
+BEVOR SIE STARTEN BEACHTEN SIE BITTE FOLGENDE HINWEISE ZUR 
+LIZENSIERUNG VON MOA SP/SS SOWIE DER VON IHM VERWENDETEN
+BIBLIOTHEKEN:
+
+1. MOA SP/SS selbst ist freie Software und wird von Bundeskanzler-
+   amt und Bundesministerium für Finanzen zu den Bedingungen der 
+   Apache 2.0 Lizenz zur Verfügung gestellt. Eine Kopie dieser
+   Lizenz finden Sie in der Datei "Apache-2.0.txt" im Verzeichnis
+   "licenses" dieser Distribution.
+   
+2. MOA SP/SS verwendet Kryptographie-Biliotheken, deren Rechte bei 
+   der Stiftung Secure Information and Communication Technologies
+   (http://jcewww.iaik.tugraz.at) liegen. Für diese Kryptographie-
+   Bibliotheken besteht folgende Situation:
+
+    Stiftung SIC gewährt dem Lizenznehmer eine nicht-exklusive, 
+    nicht-übertragbare Runtime Lizenz für die "IAIK MOA" Module 
+    im Kontext von MOA SP/SS und MOA ID. Alle Versuche, Teile oder 
+    die kompletten  IAIK Crypto Toolkits, die zusammen mit dem MOA
+    Produktbündel ausgeliefert werden, für andere Zwecke als jenem 
+    für Applikationen im MOA Kontext zu verwenden, sind nicht erlaubt. 
+    Auch weitere Versuche, die sich auf die Entwicklung von Anwendungen, 
+    oder aber darüber hinaus auf die Schaffung eines eigenen Toolkits, 
+    oder die Aufnahme in ein weiters weiteres Toolkit beziehen, sind 
+    nicht erlaubt. Die hier beschriebene Runtime Lizenz ist nicht 
+    übertragbar auf weitere Vertragspartner des Kunden, Personen, 
+    Organisationen oder Unternehmen außerhalb der Organisation des 
+    Lizenznehmers.
+      
+3. MOA SP/SS verwendet folgende weitere Bibliotheken, die allesamt
+   freie Software und in dieser Distribution bereits enthalten 
+   sind. Es gelten jedoch unterschiedliche Lizenzbedingungen:
+   
+     * Die Produkte Xerces Java 2, Xalan Java 2, Axis, Commons
+       und Log4J werden von der Apache Software Foundation zu den
+       Bedingungen der Apache 2.0 Lizenz zur Verfügung gestellt. 
+       Eine Kopie dieser Lizenz finden Sie in der Datei 
+       "Apache-2.0.txt" im Verzeichnis "licenses" dieser 
+       Distribution.
+       
+     * Das Produkt Jaxen wird von The Werken Company zu den Bedin-
+       gungen einer BSD-ähnlichen Lizenz zur Verfügung gestellt.
+       Eine Kopie dieser Lizenz finden Sie in der Datei "Jaxen.txt"
+       im Verzeichnis "licenses" dieser Distribution. 
+       
+     * Das Produkt PostgreSQL JDBC Driver wird von PostgreSQL Global
+       Development Group zu den Bedingungen einer BSD-ähnlichen 
+       Lizenz zur Verfügung gestellt. Eine Kopie dieser Lizenz finden
+       Sie in der Datei "PostgreSQL-JDBC.txt" im Verzeichnis 
+       "licenses" dieser Distribution.         
\ No newline at end of file
diff --git a/spss/server/readme.src.txt b/spss/server/readme.src.txt
new file mode 100644
index 000000000..5880bbe1c
--- /dev/null
+++ b/spss/server/readme.src.txt
@@ -0,0 +1,77 @@
+Willkommen bei der Entwicklung von von MOA SP/SS!
+
+Diese Distribution besteht aus vier Teilen:
+
+  * Entwicklungsprojekt "common", bestehend aus dem Verzeichnis
+    "common". Dieser Ordner stellt ein vollständiges Eclipse 3.0-
+    Projekt dar. "common" enthält jene Teile von MOA SP/SS, die
+    auch von anderen MOAs verwendet werden.
+    
+  * Entwicklungsprojekt "spss.server", bestehend aus dem Verzeich-
+    nis "spss.server". Dieser Ordner stellt ein vollständiges 
+    Eclipse 3.0-Projekt dar. "spss.server" stellt das eigentliche
+    Entwicklungsprojekt MOA SP/SS dar. Es benötigt als abhängiges
+    Projekt "common".
+    
+  * Entwicklungsprojekt "spss.handbook", bestehend aus dem Ver-
+    zeichnis "spss.handbook". Dieser Ordner stellt ein vollständiges 
+    Eclipse 3.0-Projekt dar. "spss.handbook" stellt das Handbuch
+    inklusive Beispielen und Demo-Clients für API- und Webservice-
+    Version von MOA SP/SS dar. 
+    
+  * Build-Scripts für Apache Ant. Diese Scripts befinden sich im
+    Verzeichnis "build". Eine Anleitung zur Bedienung der Build-
+    Scripts ist in der Datei "README.txt" in diesem Verzeichis
+    enthalten.  
+
+BEVOR SIE STARTEN BEACHTEN SIE BITTE FOLGENDE HINWEISE ZUR 
+LIZENSIERUNG VON MOA SP/SS SOWIE DER VON IHM VERWENDETEN
+BIBLIOTHEKEN:
+
+1. MOA SP/SS selbst ist freie Software und wird von Bundeskanzler-
+   amt und Bundesministerium für Finanzen zu den Bedingungen der 
+   Apache 2.0 Lizenz zur Verfügung gestellt. Eine Kopie dieser
+   Lizenz finden Sie in der Datei "Apache-2.0.txt" im Verzeichnis
+   "spss.server/licenses" dieser Distribution.
+   
+2. MOA SP/SS verwendet Kryptographie-Biliotheken, deren Rechte bei 
+   der Stiftung Secure Information and Communication Technologies
+   (http://jcewww.iaik.at) liegen. Für diese Kryptographie-Biblio-
+   theken besteht folgende Situation:
+
+    * Organisationen der österreichischen Verwaltung wird eine 
+      kostenfreie Lizenz zur Nutzung der Bibliotheken eingeräumt.
+      Die Bibliotheken können im verwaltungsinternen Bereich der
+      Webseite der IKT-Stabsstelle heruntergeladen werden
+      (http://www.cio.gv.at/iktintern/downloads/).
+       
+    * Andere Organisationen müssen eine Lizenz zur Nutzung der 
+      Bibliotheken bei der Stiftung SIC käuflich erwerben. 
+      Evaluierungsversionen können kostenlos von der Webseite von
+      Stiftung SIC 
+      (http://jce.iaik.tugraz.at/download/evaluation/index.php)
+      bezogen werden. Für die Lizensierung von Produktivversionen
+      wenden Sie sich bitte an den Verkauf von Stiftung SIC
+      (mailto:jce-sales@iaik.at).
+      
+3. MOA SP/SS verwendet folgende weitere Bibliotheken, die allesamt
+   freie Software und in dieser Distribution bereits enthalten 
+   sind. Es gelten jedoch unterschiedliche Lizenzbedingungen:
+   
+     * Die Produkte Xerces Java 2, Xalan Java 2, Axis, Commons
+       und Log4J werden von der Apache Software Foundation zu den
+       Bedingungen der Apache 2.0 Lizenz zur Verfügung gestellt. 
+       Eine Kopie dieser Lizenz finden Sie in der Datei 
+       "Apache-2.0.txt" im Verzeichnis "spss.server/licenses" dieser 
+       Distribution.
+       
+     * Das Produkt Jaxen wird von The Werken Company zu den Bedin-
+       gungen einer BSD-ähnlichen Lizenz zur Verfügung gestellt.
+       Eine Kopie dieser Lizenz finden Sie in der Datei "Jaxen.txt"
+       im Verzeichnis "spss.server/licenses" dieser Distribution. 
+       
+     * Das Produkt PostgreSQL JDBC Driver wird von PostgreSQL Global
+       Development Group zu den Bedingungen einer BSD-ähnlichen 
+       Lizenz zur Verfügung gestellt. Eine Kopie dieser Lizenz finden
+       Sie in der Datei "PostgreSQL-JDBC.txt" im Verzeichnis 
+       "spss.server/licenses" dieser Distribution.         
\ No newline at end of file
diff --git a/spss/server/readme.update.txt b/spss/server/readme.update.txt
new file mode 100644
index 000000000..ce8658f3a
--- /dev/null
+++ b/spss/server/readme.update.txt
@@ -0,0 +1,137 @@
+
+======================================================================
+  Update einer bestehenden MOA-SPSS-Installation auf Version 1.3.1
+======================================================================
+
+Es gibt zwei Möglichkeiten (im Folgenden als "Update Variante A" und 
+"Update Variante B" bezeichnet), das Update von MOA-SPSS auf Version
+1.3.1 durchzuführen. Update Variante A geht dabei den Weg über eine 
+vorangestellte Neuinstallation, während Variante B direkt eine  
+bestehende Installation aktualisiert.
+
+Folgende Begriffe werden verwendet:
+
+JAVA_HOME bezeichnet das Wurzelverzeichnis der JDK-Installation
+
+CATALINA_HOME bezeichnet das Wurzelverzeichnis der Tomcat-Installation
+
+MOA_SPSS_INST bezeichnet das Verzeichnis, in das Sie die Datei
+moa-spss-1.3.1.zip entpackt haben.
+
+
+=================
+Update Variante A 
+=================
+
+1.)	Erstellen Sie eine Sicherungskopie des kompletten Tomcat-Verzeichnisses
+	Ihrer MOA-SPSS-Installation.
+	
+2.)	Erstellen Sie eine Sicherungskopie aller "iaik*.jar"-Dateien im Verzeichnis
+	JAVA_HOME\jre\lib\ext, und löschen Sie diese Dateien danach.
+
+3.)	Führen Sie eine Neuinstallation gemäß Handbuch durch.
+
+4.)	Kopieren Sie etwaige Konfigurationsdateien, Trust-Profile und Key-Stores, 
+	die Sie aus Ihrer alten Installation beibehalten möchten, aus Ihrer
+	Sicherungskopie in die entsprechenden Verzeichnisse der neuen
+	Installation.
+	Anmerkung: Diese Distribution enthält neue A-TRUST und E-CARD-Zertifikate.
+	Falls Sie Ihre alten Trustprofile beibehalten wollen, gehen Sie wie unter
+	Update Variante B, Punkt 9 beschrieben vor, um Ihre alten Trustprofile
+	auf einen aktuellen Stand zu bringen.
+	
+5.)	Nur wenn alte Installation älter als Version 1.3.0: 
+	Falls Sie Ihre alte MOA-SP Konfigurationsdatei weiterverwenden wollen:
+	Mit dem Wechsel auf Version 1.3.1 verwendet MOA SP ein neues Format für die 
+	XML-Konfigurationsdatei. Sie müssen die Konfigurationsdatei für MOA-SP aus 
+	Ihrer alten Installation auf das neue Format konvertieren.
+	Details dazufinden Sie im MOA-SPSS-Installationshandbuch.
+	
+	
+=================
+Update Variante B 
+=================
+
+1.)	Erstellen Sie eine Sicherungskopie des kompletten Tomcat-Verzeichnisses
+	Ihrer MOA-SPSS-Installation.
+	
+2.)	Entpacken Sie die Datei "moa-spss-1.3.1.zip" in das Verzeichnis MOA_SPSS_INST.
+
+3.)	Erstellen Sie eine Sicherungskopie aller "iaik*.jar"-Dateien im Verzeichnis
+	JAVA_HOME\jre\lib\ext und löschen Sie diese Dateien danach.
+	
+4.)	Falls Sie mit jdk1.3 oder niedriger arbeiten, kopieren Sie alle Dateien
+	aus dem Verzeichnis MOA_SPSS_INST\ext13 in das Verzeichnis
+	JAVA_HOME\jre\lib\ext.
+	Falls Sie mit jdk1.4 oder höher arbeiten, kopieren Sie alle Dateien
+	aus dem Verzeichnis MOA_SPSS_INST\ext14 in das Verzeichnis
+	JAVA_HOME\jre\lib\ext.
+	
+5.)	Kopieren Sie die Dateien aus dem Verzeichnis MOA_SPSS_INST\endorsed
+	in das Verzeichnis CATALINA_HOME\common\endorsed. Überschreiben Sie dabei
+	etwaige gleichnamige Dateien.
+	
+6.) Löschen Sie das Verzeichnis CATALINA_HOME\webapps\moa-spss.
+
+7.) Ersetzen Sie die Datei CATALINA_HOME\webapps\moa-spss.war durch die Datei 
+	MOA_SPSS_INST\moa-spss.war.
+		
+8.)	Löschen Sie das Verzeichnis CATALINA_HOME\work.
+				
+9.)	Update der Trust-Profile. 
+	Wenn Sie Ihre alten Trust-Profile durch die neuen ersetzen wollen, dann gehen  
+	Sie vor, wie in Punkt a). Wenn Sie Ihre eigenen Trust-Profile beibehalten wollen,
+	dann gehen Sie vor, wie in Punkt b).
+	
+	a)	Gehen Sie wie folgt vor, um die Trust-Profile auszutauschen:
+	
+		1)	Löschen Sie das Verzeichnis CATALINA_HOME\conf\moa-spss\trustProfiles.
+		2)	Kopieren Sie das Verzeichnis MOA_SPSS_INST\conf\moa-spss\trustProfiles
+			in das Verzeichnis CATALINA_HOME\conf\moa-spss.
+		
+	b)	Falls Sie Ihre alten Trust-Profile beibehalten wollen, gehen Sie wie folgt vor,
+		um die Profile auf den aktuellen Stand zu bringen:
+	
+		1)	Löschen Sie die Datei "C=AT,O=Hauptverband oesterr. Sozialvers.,CN=CRL-Signer.der"
+			aus jedem Trustprofil, in dem sie enthalten ist. 		
+		
+		2)	Löschen Sie die Datei "OCSP Responder 02-20051027-20101027.der" aus jedem 
+			Trustprofil, in dem sie enthalten ist.
+			
+		7)	Ergänzen Sie ihre Trustprofile durch alle Zertifikate aus den entsprechenden Profilen
+			im Verzeichnis MOA_SPSS_INST\conf\moa-spss\trustprofiles, die nicht in Ihren
+			Profilen enthalten sind. Am einfachsten ist es, wenn Sie den Inhalt der einzelnen Profile
+			aus der Distribution (MOA_SPSS_INST\conf\moa-spss\trustprofiles) in die entsprechenden
+			Profile Ihrer Installation (CATALINA_HOME\conf\moa-spss\trustprofiles) kopieren und
+			dabei die vorhandenen gleichnamigen Zertifikate überschreiben), also z.B:
+			
+			Kopieren des Inhalts von 
+			MOA_SPSS_INST\conf\moa-spss\trustprofiles\certifiedSignature
+			nach
+			CATALINA_HOME\conf\moa-spss\trustprofiles\certifiedSignature
+			usw.
+		
+10.)	Update des Cert-Stores.
+		a)	Kopieren Sie den Inhalt des Verzeichnisses MOA_SPSS_INST\conf\moa-spss\certstore 
+			in das Verzeichnis CATALINA_HOME\conf\moa-spss\certstore. Wenn Sie gefragt werden, ob Sie 
+			vorhandene Dateien oder Unterverzeichnisse überschreiben sollen, dann bejahen Sie das.
+	
+		b) 	Falls vorhanden, löschen Sie die Datei "890A4C8282E95EBB398685D9501486EF213941B5" aus dem  
+			Verzeichnis CATALINA_HOME\conf\moa-spss\certstore\10F17BDACD8DEAA1E8F23FBEAE7B3EC3D9773D1D.
+			
+		c) 	Falls die Datei "E7340D1FB627D8917A9C0D23F21515C441BF1214" noch nicht im Verzeichnis 
+			CATALINA_HOME\conf\moa-spss\certstore\10F17BDACD8DEAA1E8F23FBEAE7B3EC3D9773D1D
+			enthalten ist, dann kopieren Sie diese Datei aus dem Verzeichnis
+			MOA_ID_INST_AUTH\conf\moa-spss\certstore\10F17BDACD8DEAA1E8F23FBEAE7B3EC3D9773D1D
+			in das Verzeichnis
+			CATALINA_HOME\conf\moa-spss\certstore\10F17BDACD8DEAA1E8F23FBEAE7B3EC3D9773D1D.
+	
+11.)	Nur wenn alte Installation älter als Version 1.3.0: 
+	Mit dem Wechsel auf Version 1.3.0 verwendet MOA SP ein neues Format für die 
+	XML-Konfigurationsdatei. Sie müssen die Konfigurationsdatei für MOA-SP aus 
+	Ihrer alten Installation auf das neue Format konvertieren. Details dazu 
+	finden Sie im MOA-SPSS-Installationshandbuch.
+	
+	
+
+	
diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index 50b6fc411..edf27d123 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -2,86 +2,70 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
 		<groupId>MOA.spss</groupId>
-		<artifactId>server</artifactId>
+		<artifactId>moa-spss</artifactId>
 		<version>1.4.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>MOA.spss.server</groupId>
-  <artifactId>serverlib</artifactId>
+  <artifactId>moa-spss-lib</artifactId>
   <packaging>jar</packaging>
   <version>1.4.0</version>
-  <name>MOA SPSS Serverlibrary</name>
+  <name>MOA SP/SS API</name>
 
-  <properties>
-  	<thirdPartyLib>${basedir}/../../../buildhelper</thirdPartyLib>
-  </properties>
+	<properties>
+		<repositoryPath>${basedir}/../../../repository</repositoryPath>
+	</properties>
   
   <dependencies>
     <dependency>
       <groupId>axis</groupId>
       <artifactId>axis</artifactId>
     </dependency>
-    <dependency>
-      <groupId>saaj</groupId>
-      <artifactId>saaj</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-discovery</groupId>
-      <artifactId>commons-discovery</artifactId>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>saaj</groupId>-->
+<!--      <artifactId>saaj</artifactId>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>commons-discovery</groupId>-->
+<!--      <artifactId>commons-discovery</artifactId>-->
+<!--    </dependency>-->
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
-<!--    <dependency>-->
-<!--      <groupId>iDoclet</groupId>-->
-<!--      <artifactId>iDoclet</artifactId>-->
-<!--    </dependency>-->
     <dependency>
       <groupId>javax.activation</groupId>
       <artifactId>activation</artifactId>
     </dependency>
-    <dependency>
-      <groupId>jaxen</groupId>
-      <artifactId>jaxen</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>dom</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>jaxp-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>sax</artifactId>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>jaxen</groupId>-->
+<!--      <artifactId>jaxen</artifactId>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>jaxp</groupId>-->
+<!--      <artifactId>dom</artifactId>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>jaxp</groupId>-->
+<!--      <artifactId>jaxp-api</artifactId>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>jaxp</groupId>-->
+<!--      <artifactId>sax</artifactId>-->
+<!--    </dependency>-->
 <!--    <dependency>-->
 <!--      <groupId>javaext</groupId>-->
 <!--      <artifactId>jaxrpc</artifactId>-->
 <!--    </dependency>-->
-    <dependency>
-      <groupId>org.w3c.dom</groupId>
-      <artifactId>dom</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>sax</groupId>
-      <artifactId>sax</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jsse</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jnet</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jcert</artifactId>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>org.w3c.dom</groupId>-->
+<!--      <artifactId>dom</artifactId>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>sax</groupId>-->
+<!--      <artifactId>sax</artifactId>-->
+<!--    </dependency>-->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -112,7 +96,7 @@
     </dependency>
     <dependency>
       <groupId>iaik.prod</groupId>
-      <artifactId>iaik_moa_full</artifactId>
+      <artifactId>iaik_moa</artifactId>
     </dependency>
     <dependency>
       <groupId>iaik.prod</groupId>
@@ -126,33 +110,106 @@
     <dependency>
       <groupId>iaik.prod</groupId>
       <artifactId>iaik_ecc</artifactId>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>iaik.prod</groupId>
       <artifactId>iaik_Pkcs11Provider</artifactId>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>iaik.prod</groupId>
       <artifactId>iaik_Pkcs11Wrapper</artifactId>
+      <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>iaik.win32</groupId>
-      <artifactId>Pkcs11Wrapper</artifactId>
-			<type>dll</type>
-			<version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>MOA</groupId>
-      <artifactId>common</artifactId>
-<!--      <scope>system</scope>-->
-<!--      <systemPath>${basedir}/../../../common/target</systemPath>-->
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>iaik.prod</groupId>-->
+<!--      <artifactId>iaik_Pkcs11Wrapper</artifactId>-->
+<!--			<classifier>win32</classifier>-->
+<!--			<type>dll</type>-->
+<!--			<version>1.0</version>-->
+<!--    </dependency>-->
     <dependency>
       <groupId>MOA</groupId>
-      <artifactId>common-test</artifactId>
-      <scope>system</scope>
-      <systemPath>${basedir}/../../../common-test/target</systemPath>
+      <artifactId>moa-common</artifactId>
     </dependency>
   </dependencies>
+  <build>
+      <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.2</version>
+        <configuration>
+        	<quiet>true</quiet>
+        	<author>false</author>
+        	<version>false</version>
+        	<use>true</use>
+        	<excludePackageNames>at.gv.egovernment.moa.spss.server.*;at.gv.egovernment.moa.spss.api.impl.*;at.gv.egovernment.moa.spss.impl.*</excludePackageNames>
+        	<tags>
+        		<tag>
+        			<name>pre</name>
+        			<placement>a</placement>
+        			<head>Preconditions:</head>
+        		</tag>
+        		<tag>
+        			<name>post</name>
+        			<placement>a</placement>
+        			<head>Postconfitions:</head>
+        		</tag>
+        	</tags>
+            <groups>
+	            <group>
+	              <title>API Factory and Services</title>
+	              <packages>at.gv.egovernment.moa.spss.api</packages>
+	            </group>
+	            <group>
+	              <title>Exceptions</title>
+	              <packages>at.gv.egovernment.moa.spss</packages>
+	            </group>
+	            <group>
+	              <title>API Objects for Signature Creation</title>
+	              <packages>at.gv.egovernment.moa.spss.api.xmlsign</packages>
+	            </group>
+	            <group>
+	              <title>API Objects for CMS Signature Verification</title>
+	              <packages>at.gv.egovernment.moa.spss.api.cmsverify</packages>
+	            </group>
+	            <group>
+	              <title>API Objects for XML Signature Verification</title>
+	              <packages>at.gv.egovernment.moa.spss.api.xmlverify</packages>
+	            </group>
+	            <group>
+	              <title>Common API Objects</title>
+	              <packages>at.gv.egovernment.moa.spss.api.common</packages>
+	            </group>
+	            <group>
+	              <title>Builders and Parsers to convert API Objects to and from XML</title>
+	              <packages>at.gv.egovernment.moa.spss.api.xmlbind</packages>
+	            </group>
+	            <group>
+	              <title>Utilities</title>
+	              <packages>at.gv.egovernment.moa.util</packages>
+	              <packages>at.gv.egovernment.moa.spss.util</packages>
+	            </group>
+	            <group>
+	              <title>Logging</title>
+	              <packages>at.gv.egovernment.moa.logging</packages>
+	            </group>
+	        </groups>
+	        <link>http://java.sun.com/j2se/1.4/docs/api/</link>
+        </configuration>
+		<executions>
+			<execution>
+				<id>generate-javadoc</id>
+				<phase>package</phase>
+				<goals>
+					<goal>jar</goal>
+				</goals>
+			</execution>
+		</executions>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>
diff --git a/spss/server/serverlib/resources/data/deploy/tools/certtool.bat b/spss/server/serverlib/resources/data/deploy/tools/certtool.bat
deleted file mode 100644
index 0504211b8..000000000
--- a/spss/server/serverlib/resources/data/deploy/tools/certtool.bat
+++ /dev/null
@@ -1,25 +0,0 @@
-@echo off
-
-rem
-rem Script to invoke the CertTool class
-rem 
-rem Author: Patrick Peck
-rem Version: $Id: certtool.bat,v 1.6 2003/05/08 11:46:29 peck Exp $
-rem
-
-
-if %OS%=="Windows_NT" @setlocal
-
-set CERTTOOL=at.gv.egovernment.moa.spss.server.tools.CertTool
-set TOOLSPATH=%~p0
-set CLASSPATH=%TOOLSPATH%tools.jar;%TOOLSPATH%iaik_moa_full.jar;%TOOLSPATH%iaik_jce_full.jar;%TOOLSPATH%iaik_ecc.jar;%TOOLSPATH%log4j-1.2.7.jar
-
-if "%JAVA_HOME%"=="" goto noJavaHome
-%JAVA_HOME%\bin\java.exe -classpath %CLASSPATH% %CERTTOOL% %1 %2 %3 %4 %5 %6 %7 %8 %9
-goto end
-
-:noJavaHome
-echo error: JAVA_HOME not defined
-
-:end
-if %OS%=="Windows_NT" @endlocal
\ No newline at end of file
diff --git a/spss/server/serverlib/resources/data/deploy/tools/certtool.sh b/spss/server/serverlib/resources/data/deploy/tools/certtool.sh
deleted file mode 100644
index c7ff374f4..000000000
--- a/spss/server/serverlib/resources/data/deploy/tools/certtool.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-#
-# Script to invoke the CertTool class	
-#
-# Author:Patrick Peck
-# Version: $Id: certtool.sh,v 1.9 2003/06/23 16:01:27 peck Exp $
-#
-
-
-if [ -z "$JAVA_HOME" ]; then 
-  echo "error: JAVA_HOME not defined";
-  exit;
-fi
-
-CERTOOL=at.gv.egovernment.moa.spss.server.tools.CertTool
-TOOLSPATH=`dirname $PWD/$0`
-CLASSPATH=$TOOLSPATH/tools.jar:$TOOLSPATH/iaik_moa_full.jar:$TOOLSPATH/iaik_jce_full.jar:$TOOLSPATH/iaik_ecc.jar:$TOOLSPATH/log4j-1.2.7.jar
-
-$JAVA_HOME/bin/java -classpath $CLASSPATH $CERTOOL $*
diff --git a/spss/server/serverlib/resources/data/deploy/tools/configtool.bat b/spss/server/serverlib/resources/data/deploy/tools/configtool.bat
deleted file mode 100644
index 868df11f0..000000000
--- a/spss/server/serverlib/resources/data/deploy/tools/configtool.bat
+++ /dev/null
@@ -1,25 +0,0 @@
-@echo off
-
-rem
-rem Script to invoke the ConfigTool class
-rem 
-rem Author: Gregor Karlinger
-rem Version: $Id:  $
-rem
-
-
-if %OS%=="Windows_NT" @setlocal
-
-set CONFIGTOOL=at.gv.egovernment.moa.spss.server.tools.ConfigTool
-set TOOLSPATH=%~p0
-set CLASSPATH=%TOOLSPATH%tools.jar;%TOOLSPATH%xalan.jar;
-
-if "%JAVA_HOME%"=="" goto noJavaHome
-%JAVA_HOME%\bin\java.exe -classpath %CLASSPATH% %CONFIGTOOL% %1 %2 %3 %4 %5 %6 %7 %8 %9
-goto end
-
-:noJavaHome
-echo error: JAVA_HOME not defined
-
-:end
-if %OS%=="Windows_NT" @endlocal
\ No newline at end of file
diff --git a/spss/server/serverlib/resources/data/deploy/tools/configtool.sh b/spss/server/serverlib/resources/data/deploy/tools/configtool.sh
deleted file mode 100644
index f7f29bae1..000000000
--- a/spss/server/serverlib/resources/data/deploy/tools/configtool.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-#
-# Script to invoke the ConfigTool class	
-#
-# Author: Gregor Karlinger
-# Version: $Id:  $
-#
-
-
-if [ -z "$JAVA_HOME" ]; then 
-  echo "error: JAVA_HOME not defined";
-  exit;
-fi
-
-CONFIGTOOL=at.gv.egovernment.moa.spss.server.tools.ConfigTool
-TOOLSPATH=`dirname $PWD/$0`
-CLASSPATH=$TOOLSPATH/tools.jar:$TOOLSPATH/xalan.jar
-
-$JAVA_HOME/bin/java -classpath $CLASSPATH $CONFIGTOOL $*
diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/overview.htm b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/overview.htm
deleted file mode 100644
index 9b17bbf91..000000000
--- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/overview.htm
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-</head>
-<body bgcolor="white">
-
-MOA SP/SS API documentation overview.
-
-
-<h2>Using the MOA SP/SS API</h2>
-
-<h3>Invoking the services</h3>
-In general, invoking the MOA SP/SS API involves the following steps:
-<ol>
-<li>Set the <code>moa.spss.server.configuration</code> system property to point
-to the main MOA SP/SS configuration file. This needs to be done only once per
-JVM instance. You may also call 
-{@link at.gv.egovernment.moa.spss.api.Configurator#init} at this point to 
-pre-initialize MOA SP/SS (if not, it is done automatically upon service 
-invocation).</li>
-<li>Create an instance of the service to be used 
-({@link at.gv.egovernment.moa.spss.api.SignatureCreationService} or 
-{@link at.gv.egovernment.moa.spss.api.SignatureVerificationService}),
-via its <code>getInstance()</code> method.</li>
-<li>Create an instance of the 
-{@link at.gv.egovernment.moa.spss.api.SPSSFactory}, via its
-{@link at.gv.egovernment.moa.spss.api.SPSSFactory#getInstance} method.</li>
-<li>Use the <code>create...</code> methods of the <code>SPSSFactory</code> to
-create the desired {@link at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest}, 
-{@link at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest} or 
-{@link at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest} object.
-</li>
-<li>Call one of the service methods: 
-{@link at.gv.egovernment.moa.spss.api.SignatureCreationService#createXMLSignature(at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest) <code>createXMLSignature()</code>},
-{@link at.gv.egovernment.moa.spss.api.SignatureVerificationService#verifyCMSSignature(at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest) <code>verifyCMSSignature()</code>} or
-{@link at.gv.egovernment.moa.spss.api.SignatureVerificationService#verifyXMLSignature(at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest) <code>verifyXMLSignature()</code>}.
-</li>
-<li>Analyze the result of the service call, given as a 
-{@link at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponse}, 
-{@link at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse} or
-{@link at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse}.
-In case of an error, a {@link at.gv.egovernment.moa.spss.MOAException}
-is thrown by the service. Please be aware that errors during signature creation
-are reported as part of a <code>CreateXMLSignatureResponse</code>.
-</ol>
-
-<h3>Creating MOA SP/SS API objects</h3>
-<p>
-Invoking the MOA SP/SS API <code>Service</code> classes involves creating
-a <code>Request</code> object using the {@link at.gv.egovernment.moa.spss.api.SPSSFactory SPSSFactory}.
-Object creation using the <code>SPSSFactory</code> is always bottom-up, meaning 
-that in order to create an object all of its components must have been created
-before.
-</p>
-<p>
-The names of the MOA SP/SS API classes have been chosen to correspond to the
-MOA SP/SS schema elements. The structure of the classes (i.e., their fields)
-also corresponds to the structure of the respective MOA SP/SS schema elements.
-However, a few classes escape this naming convention, mainly because the 
-corresponding schema elements contain <code>xsd:choice</code> components:
-<ul>
-<li>The various <code>Profile</code> classes have subclasses called 
-<code>ProfileID</code> and <code>ProfileExplicit</code> 
-(e.g., {@link at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfoProfileID} and
-{@link at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfoProfileExplicit}), 
-so that the profile can be given either as an ID (which is to be resolved from the 
-MOA SP/SS configuration) or explicitly.</li>
-<li>The classes {@link at.gv.egovernment.moa.spss.api.common.Content},
-{@link at.gv.egovernment.moa.spss.api.cmsverify.CMSContent} and 
-{@link at.gv.egovernment.moa.spss.api.xmlverify.TransformParameter} have 
-subclasses specifying the type of content they actually contain. E.g., 
-{@link at.gv.egovernment.moa.spss.api.common.ContentBinary} will contain 
-a byte stream.</li>
-</ul>
-
-</p>
-<p>
-For clarity, the MOA SP/SS API classes have been organized in several packages
-listed in the following table:
-</p>
-
-<table border=1 cellspacing=0 cellpadding=5>
-<tr>
-  <td>Package</td><td>Purpose</td>
-</tr>
-<tr>
-  <td>{@link at.gv.egovernment.moa.spss.api.xmlsign}</td>
-  <td>Components of the {@link at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest} and 
-  {@link at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponse}</td>
-</tr>
-<tr>
-  <td>{@link at.gv.egovernment.moa.spss.api.cmsverify}</td>
-  <td>Components of the
-  {@link at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest} and
-  {@link at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse}</td>
-</tr>
-<tr>
-  <td>{@link at.gv.egovernment.moa.spss.api.xmlverify}</td>
-  <td>Components of the
-  {@link at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest} and
-  {@link at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse}</td>
-</tr>
-<tr>
-  <td>{@link at.gv.egovernment.moa.spss.api.common}</td>
-  <td>Common components used across the classes of the above packages</td>
-</tr>
-</table>
-
-<h3>Converting MOA SP/SS API objects to and from DOM trees</h3>
-The package {@link at.gv.egovernment.moa.spss.api.xmlbind} contains helper
-classes to:
-<ul>
-<li>Parse a DOM tree containing a <code>CreateXMLSignatureRequest</code>,
-<code>VerifyCMSSignatureRequest</code> or  
-<code>VerifyCMSSignatureRequest</code> into its respective MOA SP/SS API object 
-representation. For example, to parse a <code>CreateXMLSignatureRequest</code>
-DOM tree, the {@link at.gv.egovernment.moa.spss.api.xmlbind.CreateXMLSignatureRequestParser#parse(org.w3c.dom.Element) CreateXMLSignatureRequestParser.parse()} 
-method can be used. <br />
-<b>Note:</b> The DOM tree of the request must be derived from a schema valid
-XML document. Otherwise, unexpected behaviour will almost certainly result.</li>
-<li>Build a <code>CreateXMLSignatureResponse</code>, 
-<code>VerifyCMSSignatureResponse</code> or a 
-<code>VerifyXMLSignatureResponse</code> DOM tree from the respective MOA SP/SS 
-API object. For example, to build a <code>VerifyXMLSignatureResponse</code>
-DOM tree, the {@link at.gv.egovernment.moa.spss.api.xmlbind.VerifyXMLSignatureResponseBuilder#build(at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse) VerifyXMLSignatureResponseBuilder.build()}
-can be used.<br />
-<b>Note:</b>The serialized DOM tree will be schema valid.
-</li>
-</ul>
-The DOM trees can easily be read from and written to XML byte streams using
-the methods in the {@link at.gv.egovernment.moa.util.DOMUtils} class.
-<br />
-
-<h3>Utilities and Logging</h3>
-<p> The packages {@link at.gv.egovernment.moa.util} and 
-{@link at.gv.egovernment.moa.spss.util} contain utility classes developed for
-the MOA SP/SS implementation. Since the classes contained in these packages are 
-tailored towards the MOA SP/SS implementation, they are far from being complete 
-in the sense of providing a utility class library. Therefore, they may or may 
-not prove useful in the context of your application. Their interfaces may also
-change in future releases.
-</p>
-
-<p>The package {@link at.gv.egovernment.moa.logging} contains classes for
-logging messages to the MOA SP/SS log hierarchy via the 
-{@link at.gv.egovernment.moa.logging.Logger} class.
-</p>
-
-<h3>Related Documentation</h3>
-
-See also the <a href="../moa_spss/sp-anwendung.htm#API">API example</a> in the 
-MOA SP/SS documentation.
-
-</body>
-</html>
\ No newline at end of file
diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/tools/CertTool.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/tools/CertTool.java
deleted file mode 100644
index 9fe17eae2..000000000
--- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/tools/CertTool.java
+++ /dev/null
@@ -1,242 +0,0 @@
-package at.gv.egovernment.moa.spss.server.tools;
-
-import java.io.BufferedInputStream;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.security.cert.CertificateException;
-
-import iaik.asn1.structures.Name;
-import iaik.pki.store.certstore.CertStoreException;
-import iaik.pki.store.certstore.CertStoreTypes;
-import iaik.pki.store.certstore.directory.DirectoryCertStore;
-import iaik.pki.store.certstore.directory.DirectoryCertStoreParameters;
-import iaik.pki.store.certstore.directory.DirectoryStoreException;
-import iaik.security.ecc.provider.ECCProvider;
-import iaik.security.provider.IAIK;
-import iaik.utils.RFC2253NameParserException;
-import iaik.x509.X509Certificate;
-
-/**
- * A tool to support X509 certificate handling for configuring the MOA SP/SS 
- * service.
- * 
- * This class provides functions for:
- * <ul>
- * <li>printing certificate information</li>
- * <li>adding certificates to the cert store</li>
- * </ul> 
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-public class CertTool {
-
-  /** Error message if the DN cannot be parsed according to RFC2253. */
-  private static final String ILLEGAL_RFC2253_NAME =
-    "Kein gültiger RFC2253-Name";
-
-  /**
-   * Main entry point of the tool.
-   * 
-   * @param args The command line arguments. A single argument is expected,
-   * which is the file name of the X509 certificate to inspect.
-   */
-  public static void main(String args[]) {
-    CertTool certTool = new CertTool();
-
-    if (args.length == 2 && "-info".equals(args[0])) {
-      initProviders();
-      certTool.printCertInfo(args[1], System.out);
-    } else if (args.length == 3 && "-add".equals(args[0])) {
-      initProviders();
-      certTool.addCertToCertStore(args[1], args[2]);
-    } else {
-      certTool.printUsage(System.err);
-    }
-  }
-  
-  /**
-   * Init the JCE providers, depending on the JDK used.
-   * 
-   * Adds the IAIK JCE and IAIK ECC providers.
-   */
-  private static void initProviders() {
-    if (System.getProperty("java.version").startsWith("1.3")) {
-      IAIK.addAsProvider();
-    } else {
-      IAIK.addAsJDK14Provider();
-    }
-    ECCProvider.addAsProvider();
-  }
-
-  /**
-   * Print the information about the certificate.
-   * 
-   * This method will output information about the Subject DN, the Issuer DN and
-   * the serial number of the certificate.
-   * 
-   * @param certFile The name of the certificate file to inspect.
-   * @param out The stream to print the information to.
-   */
-  public void printCertInfo(String certFile, PrintStream out) {
-    try {
-      InputStream is = new BufferedInputStream(new FileInputStream(certFile));
-      X509Certificate cert = new X509Certificate(is);
-      String issuerDN;
-      String serial;
-      String subjectDN;
-
-      try {
-        subjectDN = ((Name) (cert.getSubjectDN())).getRFC2253String();
-      } catch (RFC2253NameParserException e) {
-        subjectDN = ILLEGAL_RFC2253_NAME;
-      }
-
-      try {
-        issuerDN = ((Name) (cert.getIssuerDN())).getRFC2253String();
-      } catch (RFC2253NameParserException e) {
-        issuerDN = ILLEGAL_RFC2253_NAME;
-      }
-
-      serial = cert.getSerialNumber().toString();
-
-      out.println("SubjectDN (RFC2253): " + subjectDN);
-      out.println("IssuerDN (RFC2253) : " + issuerDN);
-      out.println("Serial Number      : " + serial);
-    } catch (FileNotFoundException e) {
-      System.err.println("Zertifikat nicht gefunden: " + certFile);
-    } catch (IOException e) {
-      System.err.println(
-        "I/O Fehler beim Lesen des Zertifikats: " + e.getMessage());
-    } catch (CertificateException e) {
-      System.err.println(
-        "Fehler beim Lesen des Zertifikats: " + e.getMessage());
-    } catch (Throwable t) {
-      System.err.println("Allgemeiner Fehler: " + t.getMessage());
-    }
-  }
-
-  /**
-   * Add a certificate to a directory certificate store.
-   * 
-   * @param certFile The certificate to add.
-   * @param certStoreRoot The root directory of the certificate store.
-   */
-  public void addCertToCertStore(String certFile, String certStoreRoot) {
-    try {
-      // read the certificate
-      InputStream is = new BufferedInputStream(new FileInputStream(certFile));
-      X509Certificate cert = new X509Certificate(is);
-
-      // initialize the DirectoryCertStore
-      DirectoryCertStore certStore =
-        new DirectoryCertStore(
-          new SimpleDirectoryCertStoreParameters(certStoreRoot),
-          null);
-      
-      certStore.storeCertificate(cert, null);
-      
-      System.out.println("\nDas Zertifikat wurde erfolreich hinzugefügt.\n");
-
-    } catch (FileNotFoundException e) {
-      System.err.println("Zertifikat nicht gefunden: " + certFile);
-    } catch (IOException e) {
-      System.err.println(
-        "I/O Fehler beim Lesen des Zertifikats: " + e.getMessage());
-    } catch (CertificateException e) {
-      System.err.println(
-        "Fehler beim Lesen des Zertifikats: " + e.getMessage());
-    } catch (DirectoryStoreException e) {
-      System.err.println(
-        "Fehler beim Öffnen des Zertifikatsspeichers: " + e.getMessage());
-    } catch (CertStoreException e) {
-      System.err.println(
-        "Fehler beim Hinzufügen des Zertifikats: " + e.getMessage());
-    } catch (Throwable t) {
-      System.err.println("Allgemeiner Fehler: " + t.getMessage());
-      t.printStackTrace();
-    }
-  }
-
-  /**
-   * Print tool usage.
-   * 
-   * @param out The <code>PrintStream</code> to print to.
-   */
-  private void printUsage(PrintStream out) {
-    out.println("\nCerttool-Syntax:\n");
-    out.println("-info <X509 Zertifikatsdatei");
-    out.println();
-    out.println("-add  <X509 Zertifikatsdatei> <Zertifikatsspeicher>");
-    out.println("\n");
-  }
-
-}
-
-/**
- * Simple implementation of the <code>DirectoryCertStoreParameters</code>
- * interface intelligent enough for setting up a simple
- * <code>DirectoryCertStore</code> in the <code>CertTool</code>.
- * 
- * @author Patrick Peck
- * @version $Id$
- */
-class SimpleDirectoryCertStoreParameters
-  implements DirectoryCertStoreParameters {
-
-  /** The cert store root directory. */
-  private String rootDirectory;
-
-  /**
-   * Create a new <code>SimpleDirectoryCertStoreParameters</code> object.
-   * 
-   * @param rootDirectory The root directory of the cert store.
-   */
-  public SimpleDirectoryCertStoreParameters(String rootDirectory) {
-    this.rootDirectory = rootDirectory;
-  }
-
-  /**
-   * @return <code>&quot;MOA Directory CertStore&quot;</code>
-   * @see iaik.pki.store.certstore.CertStoreParameters#getId()
-   */
-  public String getId() {
-    return "MOA Directory CertStore";
-  }
-
-  /**
-   * @return CertStoreTypes.DIRECTORY
-   * @see iaik.pki.store.certstore.CertStoreParameters#getType()
-   */  
-  public String getType() {
-    return CertStoreTypes.DIRECTORY;
-  }
-
-  /**
-   * @return <code>false</code>
-   * @see iaik.pki.store.certstore.CertStoreParameters#isReadOnly()
-   */
-  public boolean isReadOnly() {
-    return false;
-  }
-
-  /**
-   * @return <code>false</code>
-   * @see iaik.pki.store.certstore.directory.DirectoryCertStoreParameters#createNew()
-   */
-  public boolean createNew() {
-    return false;
-  }
-
-  /**
-   * @return The root directory given at construction time.
-   * @see iaik.pki.store.certstore.directory.DirectoryCertStoreParameters#getRootDirectory()
-   */
-  public String getRootDirectory() {
-    return rootDirectory;
-  }
-
-}
\ No newline at end of file
diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/tools/ConfigTool.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/tools/ConfigTool.java
deleted file mode 100644
index d5c3b48c1..000000000
--- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/tools/ConfigTool.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package at.gv.egovernment.moa.spss.server.tools;
-
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-/**
- * A tool for converting a MOA SPSS Version 1.0 configuration file into
- * a Version 1.3 configuration file.
- * 
- * @author Gregor Karlinger
- * @version $Id$
- */
-public class ConfigTool
-{
- 	public static void main(String[] args)
-  {  
-    if (args == null || args.length != 2)
-    {
-      System.out.println("Usage: ConfigTool <MOA.SPSS.1-0.ConfigFile.xml> <MOA.SPSS.1-3.ConfigFile.xml>");
-      System.out.println("  <MOA.SPSS.1-0.ConfigFile.xml> ... Old config file to be transformed");
-      System.out.println("  <MOA.SPSS.1-3.ConfigFile.xml> ... New config file resulting from the transform");
-      System.exit(-1);
-    }
- 	  
- 	  try
-    {
- 	    TransformerFactory tFactory = TransformerFactory.newInstance();
- 	    Transformer transformer = tFactory.newTransformer(new StreamSource(
- 	      ConfigTool.class.getResourceAsStream("/resources/tools/ConfigurationMapper.xsl")));
-      transformer.transform(new StreamSource(args[0]), new StreamResult(new FileOutputStream(args[1])));
-    	
-    	System.out.println("Successfully mapped configuration file.");
-    }
-    catch (TransformerConfigurationException e)
-    {
-      System.err.println("An error occurred during mapping the configuration file:");
-      System.err.println("  Cannot initialize XSLT transform.");
-      System.err.println("  " + e.getMessage());
-    }
-    catch (FileNotFoundException e)
-    {
-      System.err.println("An error occurred during mapping the configuration file:");
-      System.err.println("  There is a problem with the filename for the new configuration file.");
-      System.err.println("  " + e.getMessage());
-    }
-    catch (TransformerException e)
-    {
-      System.err.println("An error occurred during mapping the configuration file:");
-      System.err.println("  " + e.getMessage());
-    }
-  }
-}
diff --git a/spss/server/serverlib/src/main/javadoc/overview.html b/spss/server/serverlib/src/main/javadoc/overview.html
new file mode 100644
index 000000000..9b17bbf91
--- /dev/null
+++ b/spss/server/serverlib/src/main/javadoc/overview.html
@@ -0,0 +1,155 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+</head>
+<body bgcolor="white">
+
+MOA SP/SS API documentation overview.
+
+
+<h2>Using the MOA SP/SS API</h2>
+
+<h3>Invoking the services</h3>
+In general, invoking the MOA SP/SS API involves the following steps:
+<ol>
+<li>Set the <code>moa.spss.server.configuration</code> system property to point
+to the main MOA SP/SS configuration file. This needs to be done only once per
+JVM instance. You may also call 
+{@link at.gv.egovernment.moa.spss.api.Configurator#init} at this point to 
+pre-initialize MOA SP/SS (if not, it is done automatically upon service 
+invocation).</li>
+<li>Create an instance of the service to be used 
+({@link at.gv.egovernment.moa.spss.api.SignatureCreationService} or 
+{@link at.gv.egovernment.moa.spss.api.SignatureVerificationService}),
+via its <code>getInstance()</code> method.</li>
+<li>Create an instance of the 
+{@link at.gv.egovernment.moa.spss.api.SPSSFactory}, via its
+{@link at.gv.egovernment.moa.spss.api.SPSSFactory#getInstance} method.</li>
+<li>Use the <code>create...</code> methods of the <code>SPSSFactory</code> to
+create the desired {@link at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest}, 
+{@link at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest} or 
+{@link at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest} object.
+</li>
+<li>Call one of the service methods: 
+{@link at.gv.egovernment.moa.spss.api.SignatureCreationService#createXMLSignature(at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest) <code>createXMLSignature()</code>},
+{@link at.gv.egovernment.moa.spss.api.SignatureVerificationService#verifyCMSSignature(at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest) <code>verifyCMSSignature()</code>} or
+{@link at.gv.egovernment.moa.spss.api.SignatureVerificationService#verifyXMLSignature(at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest) <code>verifyXMLSignature()</code>}.
+</li>
+<li>Analyze the result of the service call, given as a 
+{@link at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponse}, 
+{@link at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse} or
+{@link at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse}.
+In case of an error, a {@link at.gv.egovernment.moa.spss.MOAException}
+is thrown by the service. Please be aware that errors during signature creation
+are reported as part of a <code>CreateXMLSignatureResponse</code>.
+</ol>
+
+<h3>Creating MOA SP/SS API objects</h3>
+<p>
+Invoking the MOA SP/SS API <code>Service</code> classes involves creating
+a <code>Request</code> object using the {@link at.gv.egovernment.moa.spss.api.SPSSFactory SPSSFactory}.
+Object creation using the <code>SPSSFactory</code> is always bottom-up, meaning 
+that in order to create an object all of its components must have been created
+before.
+</p>
+<p>
+The names of the MOA SP/SS API classes have been chosen to correspond to the
+MOA SP/SS schema elements. The structure of the classes (i.e., their fields)
+also corresponds to the structure of the respective MOA SP/SS schema elements.
+However, a few classes escape this naming convention, mainly because the 
+corresponding schema elements contain <code>xsd:choice</code> components:
+<ul>
+<li>The various <code>Profile</code> classes have subclasses called 
+<code>ProfileID</code> and <code>ProfileExplicit</code> 
+(e.g., {@link at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfoProfileID} and
+{@link at.gv.egovernment.moa.spss.api.xmlsign.CreateTransformsInfoProfileExplicit}), 
+so that the profile can be given either as an ID (which is to be resolved from the 
+MOA SP/SS configuration) or explicitly.</li>
+<li>The classes {@link at.gv.egovernment.moa.spss.api.common.Content},
+{@link at.gv.egovernment.moa.spss.api.cmsverify.CMSContent} and 
+{@link at.gv.egovernment.moa.spss.api.xmlverify.TransformParameter} have 
+subclasses specifying the type of content they actually contain. E.g., 
+{@link at.gv.egovernment.moa.spss.api.common.ContentBinary} will contain 
+a byte stream.</li>
+</ul>
+
+</p>
+<p>
+For clarity, the MOA SP/SS API classes have been organized in several packages
+listed in the following table:
+</p>
+
+<table border=1 cellspacing=0 cellpadding=5>
+<tr>
+  <td>Package</td><td>Purpose</td>
+</tr>
+<tr>
+  <td>{@link at.gv.egovernment.moa.spss.api.xmlsign}</td>
+  <td>Components of the {@link at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest} and 
+  {@link at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureResponse}</td>
+</tr>
+<tr>
+  <td>{@link at.gv.egovernment.moa.spss.api.cmsverify}</td>
+  <td>Components of the
+  {@link at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest} and
+  {@link at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse}</td>
+</tr>
+<tr>
+  <td>{@link at.gv.egovernment.moa.spss.api.xmlverify}</td>
+  <td>Components of the
+  {@link at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureRequest} and
+  {@link at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse}</td>
+</tr>
+<tr>
+  <td>{@link at.gv.egovernment.moa.spss.api.common}</td>
+  <td>Common components used across the classes of the above packages</td>
+</tr>
+</table>
+
+<h3>Converting MOA SP/SS API objects to and from DOM trees</h3>
+The package {@link at.gv.egovernment.moa.spss.api.xmlbind} contains helper
+classes to:
+<ul>
+<li>Parse a DOM tree containing a <code>CreateXMLSignatureRequest</code>,
+<code>VerifyCMSSignatureRequest</code> or  
+<code>VerifyCMSSignatureRequest</code> into its respective MOA SP/SS API object 
+representation. For example, to parse a <code>CreateXMLSignatureRequest</code>
+DOM tree, the {@link at.gv.egovernment.moa.spss.api.xmlbind.CreateXMLSignatureRequestParser#parse(org.w3c.dom.Element) CreateXMLSignatureRequestParser.parse()} 
+method can be used. <br />
+<b>Note:</b> The DOM tree of the request must be derived from a schema valid
+XML document. Otherwise, unexpected behaviour will almost certainly result.</li>
+<li>Build a <code>CreateXMLSignatureResponse</code>, 
+<code>VerifyCMSSignatureResponse</code> or a 
+<code>VerifyXMLSignatureResponse</code> DOM tree from the respective MOA SP/SS 
+API object. For example, to build a <code>VerifyXMLSignatureResponse</code>
+DOM tree, the {@link at.gv.egovernment.moa.spss.api.xmlbind.VerifyXMLSignatureResponseBuilder#build(at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse) VerifyXMLSignatureResponseBuilder.build()}
+can be used.<br />
+<b>Note:</b>The serialized DOM tree will be schema valid.
+</li>
+</ul>
+The DOM trees can easily be read from and written to XML byte streams using
+the methods in the {@link at.gv.egovernment.moa.util.DOMUtils} class.
+<br />
+
+<h3>Utilities and Logging</h3>
+<p> The packages {@link at.gv.egovernment.moa.util} and 
+{@link at.gv.egovernment.moa.spss.util} contain utility classes developed for
+the MOA SP/SS implementation. Since the classes contained in these packages are 
+tailored towards the MOA SP/SS implementation, they are far from being complete 
+in the sense of providing a utility class library. Therefore, they may or may 
+not prove useful in the context of your application. Their interfaces may also
+change in future releases.
+</p>
+
+<p>The package {@link at.gv.egovernment.moa.logging} contains classes for
+logging messages to the MOA SP/SS log hierarchy via the 
+{@link at.gv.egovernment.moa.logging.Logger} class.
+</p>
+
+<h3>Related Documentation</h3>
+
+See also the <a href="../moa_spss/sp-anwendung.htm#API">API example</a> in the 
+MOA SP/SS documentation.
+
+</body>
+</html>
\ No newline at end of file
diff --git a/spss/server/serverws/assembly.xml b/spss/server/serverws/assembly.xml
deleted file mode 100644
index a28fbfecf..000000000
--- a/spss/server/serverws/assembly.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<assembly>
-  <id>ws</id>
-  <formats>
-    <format>war</format>
-  </formats>
-
-	<includeBaseDirectory>false</includeBaseDirectory>
-
-	<files>
-		<file>
-			<source>${basedir}/resources/wsdl/MOA-SPSS-1.3.xsd</source>
-			<outputDirectory>/resources/schemas</outputDirectory>
-		</file>
-	</files>
-
-  <fileSets>
-    <fileSet>
-      <directory>${basedir}/../../handbook/conf/moa-spss</directory>
-	  	<outputDirectory>/WEB-INF/conf/moa-spss</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>${basedir}/src/main/webapp/WEB-INF</directory>
-	  	<outputDirectory>/WEB-INF</outputDirectory>
-    </fileSet>
-
-    <fileSet>
-      <directory>additional/licenses</directory>
-	  	<outputDirectory>/dist/ws/licenses</outputDirectory>
-    </fileSet>
-
-    <fileSet>
-      <directory>${basedir}/../../../common/target</directory>
-	  	<outputDirectory>/WEB-INF/lib</outputDirectory>
-			<includes>
-				<include>**/*.jar</include>
-			</includes>
-    </fileSet>
-
-  </fileSets>
-
-  <dependencySets>
-		<dependencySet>
-			<includes>
-				<include>axis:axis</include>
-				<include>commons-discovery:commons-discovery</include>
-				<include>commons-logging:commons-logging</include>
-				<include>iaik.prod:iaik_cms</include>
-				<include>iaik.prod:iaik_ixsil</include>
-				<include>iaik.prod:iaik_moa_full</include>
-				<include>iaik.prod:iaik_Pkcs11Wrapper</include>
-				<include>jaxen:jaxen-core</include>
-				<include>jaxen:jaxen-dom</include>
-				<include>jaxp:dom</include>
-				<include>jaxp:jaxp-api</include>
-				<include>javaext:jaxrpc</include>
-				<include>log4j:log4j</include>
-				<include>postgresql:postgresql</include>
-				<include>saaj:saaj</include>
-				<include>sax:sax</include>
-				<include>saxpath:saxpath</include>
-				<include>wsdl4j:wsdl4j</include>
-				<include>xalan:xalan</include>
-				<include>xerces:xercesImpl</include>
-				<include>xerces:xmlParserAPIs</include>
-				<include>MOA.spss.server:serverlib</include>
-			</includes>
-			<outputDirectory>/WEB-INF/lib</outputDirectory>
-		</dependencySet>
-	</dependencySets>
-
- </assembly>
\ No newline at end of file
diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml
index 8fb467bb2..382e19d46 100644
--- a/spss/server/serverws/pom.xml
+++ b/spss/server/serverws/pom.xml
@@ -1,145 +1,66 @@
 <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.spss</groupId>
-		<artifactId>server</artifactId>
-		<version>1.4.0</version>
-  </parent>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>MOA.spss</groupId>
+        <artifactId>moa-spss</artifactId>
+        <version>1.4.0</version>
+    </parent>
 
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>MOA.spss.server</groupId>
-  <artifactId>serverweb</artifactId>
-  <packaging>pom</packaging>
-  <version>1.4.0</version>
-  <name>MOA SPSS Server-Web</name>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>MOA.spss.server</groupId>
+    <artifactId>moa-spss-ws</artifactId>
+    <packaging>war</packaging>
+    <version>1.4.0</version>
+    <name>MOA SP/SS WebService</name>
 
-  <properties>
-  	<thirdPartyLib>${basedir}/../../../buildhelper</thirdPartyLib>
-  </properties>
- 
-  <build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-	        <configuration>
-	          <descriptors>
-	            <descriptor>${basedir}/assembly.xml</descriptor>
-	          </descriptors>
-	        </configuration>
-	        <executions>
-	          <execution>
-	            <id>mk</id>
-	            <phase>package</phase>
-	            <goals>
-	              <goal>attached</goal>
-	            </goals>
-	          </execution>
-	        </executions>
-			</plugin>  
-		</plugins>  
-	</build>
-	
-  <dependencies>
-    <dependency>
-      <groupId>axis</groupId>
-      <artifactId>axis</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-discovery</groupId>
-      <artifactId>commons-discovery</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</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>dom</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>jaxp-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>javaext</groupId>
-      <artifactId>jaxrpc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>postgresql</groupId>
-      <artifactId>postgresql</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>saaj</groupId>
-      <artifactId>saaj</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>sax</groupId>
-      <artifactId>sax</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>saxpath</groupId>
-      <artifactId>saxpath</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>wsdl4j</groupId>
-      <artifactId>wsdl4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>xalan</groupId>
-      <artifactId>xalan</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xmlParserAPIs</artifactId>
-    </dependency>
+    <properties>
+        <repositoryPath>${basedir}/../../../repository</repositoryPath>
+    </properties>
 
-    <dependency>
-      <groupId>MOA.spss.server</groupId>
-      <artifactId>serverlib</artifactId>
-			<version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>MOA</groupId>
-      <artifactId>common</artifactId>
-    </dependency>
+    <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>
+                    <warName>moa-spss</warName>
+                    <webResources>
+                        <resource>
+                            <directory>${basedir}/resources/wsdl</directory>
+                            <targetPath>resources/schemas</targetPath>
+                            <includes>
+                                <inclulde>*.xsd</inclulde>
+                            </includes>
+                        </resource>
+                        <resource>
+                            <directory>${basedir}/../../handbook</directory>
+                            <targetPath>WEB-INF</targetPath>
+                            <includes>
+                                <include>conf/**</include>
+                            </includes>
+                        </resource>
+                    </webResources>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_cms</artifactId>
-			<scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_moa_full</artifactId>
-			<scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_ixsil</artifactId>
-			<scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_Pkcs11Wrapper</artifactId>
-			<scope>runtime</scope>
-    </dependency>
-  </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>MOA.spss.server</groupId>
+            <artifactId>moa-spss-lib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>MOA</groupId>
+            <artifactId>moa-common</artifactId>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/spss/server/tools/pom.xml b/spss/server/tools/pom.xml
new file mode 100644
index 000000000..9ecc2b240
--- /dev/null
+++ b/spss/server/tools/pom.xml
@@ -0,0 +1,34 @@
+<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.spss</groupId>
+		<artifactId>moa-spss</artifactId>
+		<version>1.4.0</version>
+	</parent>
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>MOA.spss.server</groupId>
+	<artifactId>moa-spss-tools</artifactId>
+	<packaging>jar</packaging>
+	<version>1.4.0</version>
+	<name>MOA SP/SS Tools</name>
+
+	<properties>
+		<thirdPartyLib>${basedir}/../../../buildhelper</thirdPartyLib>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>MOA.spss.server</groupId>
+			<artifactId>moa-spss-lib</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	    <dependency>
+	      <groupId>iaik.prod</groupId>
+	      <artifactId>iaik_ecc</artifactId>
+	      <scope>compile</scope>
+	    </dependency>
+	</dependencies>
+
+</project>
diff --git a/spss/server/tools/src/main/java/at/gv/egovernment/moa/spss/server/tools/CertTool.java b/spss/server/tools/src/main/java/at/gv/egovernment/moa/spss/server/tools/CertTool.java
new file mode 100644
index 000000000..9fe17eae2
--- /dev/null
+++ b/spss/server/tools/src/main/java/at/gv/egovernment/moa/spss/server/tools/CertTool.java
@@ -0,0 +1,242 @@
+package at.gv.egovernment.moa.spss.server.tools;
+
+import java.io.BufferedInputStream;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.security.cert.CertificateException;
+
+import iaik.asn1.structures.Name;
+import iaik.pki.store.certstore.CertStoreException;
+import iaik.pki.store.certstore.CertStoreTypes;
+import iaik.pki.store.certstore.directory.DirectoryCertStore;
+import iaik.pki.store.certstore.directory.DirectoryCertStoreParameters;
+import iaik.pki.store.certstore.directory.DirectoryStoreException;
+import iaik.security.ecc.provider.ECCProvider;
+import iaik.security.provider.IAIK;
+import iaik.utils.RFC2253NameParserException;
+import iaik.x509.X509Certificate;
+
+/**
+ * A tool to support X509 certificate handling for configuring the MOA SP/SS 
+ * service.
+ * 
+ * This class provides functions for:
+ * <ul>
+ * <li>printing certificate information</li>
+ * <li>adding certificates to the cert store</li>
+ * </ul> 
+ * 
+ * @author Patrick Peck
+ * @version $Id$
+ */
+public class CertTool {
+
+  /** Error message if the DN cannot be parsed according to RFC2253. */
+  private static final String ILLEGAL_RFC2253_NAME =
+    "Kein gültiger RFC2253-Name";
+
+  /**
+   * Main entry point of the tool.
+   * 
+   * @param args The command line arguments. A single argument is expected,
+   * which is the file name of the X509 certificate to inspect.
+   */
+  public static void main(String args[]) {
+    CertTool certTool = new CertTool();
+
+    if (args.length == 2 && "-info".equals(args[0])) {
+      initProviders();
+      certTool.printCertInfo(args[1], System.out);
+    } else if (args.length == 3 && "-add".equals(args[0])) {
+      initProviders();
+      certTool.addCertToCertStore(args[1], args[2]);
+    } else {
+      certTool.printUsage(System.err);
+    }
+  }
+  
+  /**
+   * Init the JCE providers, depending on the JDK used.
+   * 
+   * Adds the IAIK JCE and IAIK ECC providers.
+   */
+  private static void initProviders() {
+    if (System.getProperty("java.version").startsWith("1.3")) {
+      IAIK.addAsProvider();
+    } else {
+      IAIK.addAsJDK14Provider();
+    }
+    ECCProvider.addAsProvider();
+  }
+
+  /**
+   * Print the information about the certificate.
+   * 
+   * This method will output information about the Subject DN, the Issuer DN and
+   * the serial number of the certificate.
+   * 
+   * @param certFile The name of the certificate file to inspect.
+   * @param out The stream to print the information to.
+   */
+  public void printCertInfo(String certFile, PrintStream out) {
+    try {
+      InputStream is = new BufferedInputStream(new FileInputStream(certFile));
+      X509Certificate cert = new X509Certificate(is);
+      String issuerDN;
+      String serial;
+      String subjectDN;
+
+      try {
+        subjectDN = ((Name) (cert.getSubjectDN())).getRFC2253String();
+      } catch (RFC2253NameParserException e) {
+        subjectDN = ILLEGAL_RFC2253_NAME;
+      }
+
+      try {
+        issuerDN = ((Name) (cert.getIssuerDN())).getRFC2253String();
+      } catch (RFC2253NameParserException e) {
+        issuerDN = ILLEGAL_RFC2253_NAME;
+      }
+
+      serial = cert.getSerialNumber().toString();
+
+      out.println("SubjectDN (RFC2253): " + subjectDN);
+      out.println("IssuerDN (RFC2253) : " + issuerDN);
+      out.println("Serial Number      : " + serial);
+    } catch (FileNotFoundException e) {
+      System.err.println("Zertifikat nicht gefunden: " + certFile);
+    } catch (IOException e) {
+      System.err.println(
+        "I/O Fehler beim Lesen des Zertifikats: " + e.getMessage());
+    } catch (CertificateException e) {
+      System.err.println(
+        "Fehler beim Lesen des Zertifikats: " + e.getMessage());
+    } catch (Throwable t) {
+      System.err.println("Allgemeiner Fehler: " + t.getMessage());
+    }
+  }
+
+  /**
+   * Add a certificate to a directory certificate store.
+   * 
+   * @param certFile The certificate to add.
+   * @param certStoreRoot The root directory of the certificate store.
+   */
+  public void addCertToCertStore(String certFile, String certStoreRoot) {
+    try {
+      // read the certificate
+      InputStream is = new BufferedInputStream(new FileInputStream(certFile));
+      X509Certificate cert = new X509Certificate(is);
+
+      // initialize the DirectoryCertStore
+      DirectoryCertStore certStore =
+        new DirectoryCertStore(
+          new SimpleDirectoryCertStoreParameters(certStoreRoot),
+          null);
+      
+      certStore.storeCertificate(cert, null);
+      
+      System.out.println("\nDas Zertifikat wurde erfolreich hinzugefügt.\n");
+
+    } catch (FileNotFoundException e) {
+      System.err.println("Zertifikat nicht gefunden: " + certFile);
+    } catch (IOException e) {
+      System.err.println(
+        "I/O Fehler beim Lesen des Zertifikats: " + e.getMessage());
+    } catch (CertificateException e) {
+      System.err.println(
+        "Fehler beim Lesen des Zertifikats: " + e.getMessage());
+    } catch (DirectoryStoreException e) {
+      System.err.println(
+        "Fehler beim Öffnen des Zertifikatsspeichers: " + e.getMessage());
+    } catch (CertStoreException e) {
+      System.err.println(
+        "Fehler beim Hinzufügen des Zertifikats: " + e.getMessage());
+    } catch (Throwable t) {
+      System.err.println("Allgemeiner Fehler: " + t.getMessage());
+      t.printStackTrace();
+    }
+  }
+
+  /**
+   * Print tool usage.
+   * 
+   * @param out The <code>PrintStream</code> to print to.
+   */
+  private void printUsage(PrintStream out) {
+    out.println("\nCerttool-Syntax:\n");
+    out.println("-info <X509 Zertifikatsdatei");
+    out.println();
+    out.println("-add  <X509 Zertifikatsdatei> <Zertifikatsspeicher>");
+    out.println("\n");
+  }
+
+}
+
+/**
+ * Simple implementation of the <code>DirectoryCertStoreParameters</code>
+ * interface intelligent enough for setting up a simple
+ * <code>DirectoryCertStore</code> in the <code>CertTool</code>.
+ * 
+ * @author Patrick Peck
+ * @version $Id$
+ */
+class SimpleDirectoryCertStoreParameters
+  implements DirectoryCertStoreParameters {
+
+  /** The cert store root directory. */
+  private String rootDirectory;
+
+  /**
+   * Create a new <code>SimpleDirectoryCertStoreParameters</code> object.
+   * 
+   * @param rootDirectory The root directory of the cert store.
+   */
+  public SimpleDirectoryCertStoreParameters(String rootDirectory) {
+    this.rootDirectory = rootDirectory;
+  }
+
+  /**
+   * @return <code>&quot;MOA Directory CertStore&quot;</code>
+   * @see iaik.pki.store.certstore.CertStoreParameters#getId()
+   */
+  public String getId() {
+    return "MOA Directory CertStore";
+  }
+
+  /**
+   * @return CertStoreTypes.DIRECTORY
+   * @see iaik.pki.store.certstore.CertStoreParameters#getType()
+   */  
+  public String getType() {
+    return CertStoreTypes.DIRECTORY;
+  }
+
+  /**
+   * @return <code>false</code>
+   * @see iaik.pki.store.certstore.CertStoreParameters#isReadOnly()
+   */
+  public boolean isReadOnly() {
+    return false;
+  }
+
+  /**
+   * @return <code>false</code>
+   * @see iaik.pki.store.certstore.directory.DirectoryCertStoreParameters#createNew()
+   */
+  public boolean createNew() {
+    return false;
+  }
+
+  /**
+   * @return The root directory given at construction time.
+   * @see iaik.pki.store.certstore.directory.DirectoryCertStoreParameters#getRootDirectory()
+   */
+  public String getRootDirectory() {
+    return rootDirectory;
+  }
+
+}
\ No newline at end of file
diff --git a/spss/server/tools/src/main/java/at/gv/egovernment/moa/spss/server/tools/ConfigTool.java b/spss/server/tools/src/main/java/at/gv/egovernment/moa/spss/server/tools/ConfigTool.java
new file mode 100644
index 000000000..d5c3b48c1
--- /dev/null
+++ b/spss/server/tools/src/main/java/at/gv/egovernment/moa/spss/server/tools/ConfigTool.java
@@ -0,0 +1,59 @@
+package at.gv.egovernment.moa.spss.server.tools;
+
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+/**
+ * A tool for converting a MOA SPSS Version 1.0 configuration file into
+ * a Version 1.3 configuration file.
+ * 
+ * @author Gregor Karlinger
+ * @version $Id$
+ */
+public class ConfigTool
+{
+ 	public static void main(String[] args)
+  {  
+    if (args == null || args.length != 2)
+    {
+      System.out.println("Usage: ConfigTool <MOA.SPSS.1-0.ConfigFile.xml> <MOA.SPSS.1-3.ConfigFile.xml>");
+      System.out.println("  <MOA.SPSS.1-0.ConfigFile.xml> ... Old config file to be transformed");
+      System.out.println("  <MOA.SPSS.1-3.ConfigFile.xml> ... New config file resulting from the transform");
+      System.exit(-1);
+    }
+ 	  
+ 	  try
+    {
+ 	    TransformerFactory tFactory = TransformerFactory.newInstance();
+ 	    Transformer transformer = tFactory.newTransformer(new StreamSource(
+ 	      ConfigTool.class.getResourceAsStream("/resources/tools/ConfigurationMapper.xsl")));
+      transformer.transform(new StreamSource(args[0]), new StreamResult(new FileOutputStream(args[1])));
+    	
+    	System.out.println("Successfully mapped configuration file.");
+    }
+    catch (TransformerConfigurationException e)
+    {
+      System.err.println("An error occurred during mapping the configuration file:");
+      System.err.println("  Cannot initialize XSLT transform.");
+      System.err.println("  " + e.getMessage());
+    }
+    catch (FileNotFoundException e)
+    {
+      System.err.println("An error occurred during mapping the configuration file:");
+      System.err.println("  There is a problem with the filename for the new configuration file.");
+      System.err.println("  " + e.getMessage());
+    }
+    catch (TransformerException e)
+    {
+      System.err.println("An error occurred during mapping the configuration file:");
+      System.err.println("  " + e.getMessage());
+    }
+  }
+}
-- 
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
---
 IAIK-LICENSE.txt                                   | 108 ++++
 LICENSE-2.0.txt                                    | 202 +++++++
 NOTICE.txt                                         |  16 +
 common/pom.xml                                     |   4 +-
 .../java/at/gv/egovernment/moa/util/Constants.java |   2 +-
 .../schemas/MOA-ID-Configuration-1.4.4.xsd         | 612 +++++++++++++++++++++
 id/assembly-auth.xml                               |   7 +-
 id/assembly-proxy.xml                              |  18 +-
 id/history.txt                                     |   8 +
 id/pom.xml                                         |   4 +-
 id/readme_1.4.4.txt                                | 233 ++++++++
 id/server/auth/pom.xml                             |   4 +-
 .../moa-id/transforms/TransformsInfoAuthBlock.xml  |   2 +-
 .../transforms/TransformsInfoAuthBlockText.xml     |   2 +-
 .../TransformsInfoAuthBlockText_deprecated.xml     |   2 +-
 .../TransformsInfoAuthBlock_deprecated.xml         |   2 +-
 .../moa-spss/profiles/MOAIDTransformAuthBlock.xml  |   4 +-
 .../profiles/MOAIDTransformAuthBlockText.xml       |   4 +-
 .../MOAIDTransformAuthBlockText_deprecated.xml     |   4 +-
 .../MOAIDTransformAuthBlock_deprecated.xml         |   4 +-
 id/server/doc/MOA-ID-Configuration-1.4.4.xsd       | 612 +++++++++++++++++++++
 id/server/doc/moa_id/id-admin_2.htm                |  18 +-
 id/server/idserverlib/pom.xml                      |   4 +-
 .../builder/CreateXMLSignatureRequestBuilder.java  |   2 +-
 id/server/pom.xml                                  |   4 +-
 id/server/proxy/pom.xml                            |   4 +-
 licenses/APACHE-LICENSE-2.0.txt                    | 202 -------
 licenses/IAIK-LICENSE.txt                          | 108 ----
 licenses/NOTICE.txt                                |  16 -
 pom.xml                                            |  14 +-
 spss/assembly-lib.xml                              |   9 +-
 spss/assembly.xml                                  |   9 +-
 spss/handbook/handbook/config/config.html          |   2 +-
 spss/handbook/handbook/faq/faq.html                |   2 +-
 spss/handbook/handbook/index.html                  |   2 +-
 spss/handbook/handbook/install/install.html        |   8 +-
 spss/handbook/handbook/intro/intro.html            |   4 +-
 spss/handbook/handbook/usage/usage.html            |   2 +-
 spss/pom.xml                                       |   2 +-
 spss/server/history.txt                            |   8 +
 spss/server/serverlib/pom.xml                      |   2 +-
 .../serverlib/resources/licenses/Apache-2.0.txt    | 202 -------
 .../serverlib/resources/licenses/IAIK-License.txt  |  13 -
 spss/server/serverlib/resources/licenses/Jaxen.txt |  40 --
 .../resources/licenses/PostgreSQL-JDBC.txt         |  26 -
 spss/server/serverws/pom.xml                       |   2 +-
 46 files changed, 1891 insertions(+), 668 deletions(-)
 create mode 100644 IAIK-LICENSE.txt
 create mode 100644 LICENSE-2.0.txt
 create mode 100644 NOTICE.txt
 create mode 100644 common/src/main/resources/resources/schemas/MOA-ID-Configuration-1.4.4.xsd
 create mode 100644 id/readme_1.4.4.txt
 create mode 100644 id/server/doc/MOA-ID-Configuration-1.4.4.xsd
 delete mode 100644 licenses/APACHE-LICENSE-2.0.txt
 delete mode 100644 licenses/IAIK-LICENSE.txt
 delete mode 100644 licenses/NOTICE.txt
 delete mode 100644 spss/server/serverlib/resources/licenses/Apache-2.0.txt
 delete mode 100644 spss/server/serverlib/resources/licenses/IAIK-License.txt
 delete mode 100644 spss/server/serverlib/resources/licenses/Jaxen.txt
 delete mode 100644 spss/server/serverlib/resources/licenses/PostgreSQL-JDBC.txt

(limited to 'spss/server/serverlib/resources')

diff --git a/IAIK-LICENSE.txt b/IAIK-LICENSE.txt
new file mode 100644
index 000000000..4fa412cf8
--- /dev/null
+++ b/IAIK-LICENSE.txt
@@ -0,0 +1,108 @@
+Stiftung SIC License Agreement for "IAIK MOA"
+
+Valid from December 1st, 2005
+
+The Stiftung SIC
+Stiftung Secure Information and Communication Technologies
+Inffeldgasse16a, A-8010 Graz, Austria, hereafter referred to as "Stiftung SIC", 
+offers to grant licences for the SOFTWARE defined below according to the following conditions:
+
+1. DEFINITIONS
+For the purpose of this Licence Agreement, the following definitions are valid:
+
+a. The term "SOFTWARE" refers to the "IAIK MOA" bundle in any 
+form (object code or other) including documentation. The 
+SOFTWARE is the sole property of Stiftung SIC and protected by 
+Austrian, International Copyright Law, e.g. the Revised Berne 
+Convention, and the US Copyright Act.
+
+b. "IAIK MOA" is distributed in documentation, manuals, and user 
+guides, tools - including any revisions, patches and updates 
+downloaded by the customer.
+
+c."IAIK MOA Runtime Modules" means the runtime object code 
+modules provided with, or derived from the SOFTWARE.
+
+d. "MOA modules" mean the modules for online applications made 
+available by the Austrian Federal Chancellery and they consist of 
+MOA-Signature Creation (MOA-SS), MOA-Signature Verification 
+(MOA-SP) and MOA-Identification (MOA-ID).
+
+2. GRANTING of LICENCES
+
+The licensee is granted as specified below:
+
+o IAIK MOA Runtime License
+Stiftung SIC grants the Licensee a non-exclusive, non-transferable runtime licence to use the 
+"IAIK MOA" modules in the context of unmodified MOA modules. Any attempt to use any parts or 
+the whole IAIK Crypto Toolkits which come bundled together with the MOA modules for any 
+purpose other than accessing these MOA modules by applications, including, but not limited to, 
+the development of applications, the creation of a toolkit, or inclusion in a different toolkit, is not 
+permitted without additional licenses. These licences are not transferable to contractors or any 
+other persons, organisations or companies outside the licensee's organisation without making 
+such persons, organisations or companies explicitly aware of the restrictions of these licenses 
+and such persons, organisations or companies explicitly agree to observe these restrictions.
+
+3. LIMITATIONS for all LICENCES:
+LICENSEES must not attempt to reverse engineer, decompile, disassemble, reverse, translate or in 
+any other manner decode the computer programmes in the IAIK libraries in order to derive the 
+source code there from. 
+
+4. WARRANTY:
+Stiftung SIC guarantees that the SOFTWARE is free of any computer virus or other malicious 
+hidden routines that would intentionally cause damage to or corrupt data, storage media or 
+equipment. For proving the integrity of the SOFTWARE, Stiftung SIC may calculate a SHA-1 hash 
+value over the distribution file and publish it on its web site. It is the duty of the licensee to verify this 
+hash value. If the hash value cannot be verified, Stiftung SIC declines any warranties on that 
+software, and the licensee should immediately (or within 30 days of delivery at the latest), contact 
+Stiftung SIC for verification and reshipment.
+The SOFTWARE is provided "as is" and except for the declaration and warranty stated in this 
+section, Stiftung SIC makes no representations, conditions or warranties, either express or implied, 
+relative to the SOFTWARE or services provided hereunder, including all implied conditions or 
+warranties of merchantability and fitness for a particular purpose and all conditions with respect to 
+intellectual property infringement. Stiftung SIC may, but shall not be obliged to, fix errors in any 
+SOFTWARE.
+
+5. PROPRIETARY INFORMATION and CONFIDENTIALITY:
+The LICENSEE acknowledges that the SOFTWARE remains the property of, and is confidential to, 
+Stiftung SIC and incorporates trade secrets of Stiftung SIC, and that Stiftung SIC shall have the 
+exclusive right to any copyrights or patents in respect of the SOFTWARE. The LICENSEE agrees to 
+maintain the confidentiality of the SOFTWARE.
+The LICENSEE further agrees that (with the exception of paragraph 2 above), he shall not make 
+any disclosure of the SOFTWARE (including copies thereof or methods or concepts utilised therein) 
+to any person or entity, other than employees of the LICENSEE, to whom such disclosure is 
+necessary in order to use the SOFTWARE as provided herein. The LICENSEE shall appropriately 
+notify each employee to whom any such disclosure is made. Such disclosure must be made in 
+confidence and shall be kept in confidence by the employee in question.
+The LICENSEE agrees to use diligent and determined efforts to secure and protect the 
+SOFTWARE and copies thereof in a manner consistent with their proprietary character and the 
+maintenance of Licensor's rights therein, and without limitation thereof, to take appropriate action, 
+by instruction or agreement with its employees who are permitted access to the SOFTWARE or 
+copies thereof, or otherwise, to satisfy its obligations as hereby stated.
+
+6. TERMINATION:
+Stiftung SIC may terminate this Agreement without prior notice, if the licensee 1. neglects or fails to 
+perform or observe, or correct a breach of its obligations to Stiftung SIC; 2. goes out of business, 
+files a bankruptcy petition or has such a petition filed involuntarily against it or becomes insolvent; 3. 
+develops, sells, licenses or distributes or attempts to develop, sell, license or distribute any software 
+based on the SOFTWARE which is outside the scope of the limited rights granted herein, to any 
+third party. In the event of such a termination, the Licensee shall immediately destroy all copies and 
+ensure that all backup copies are destroyed as well.
+
+Stiftung SIC may at any time stop granting free licenses of the SOFTWARE in combination with the 
+MOA modules without prior notice. In this case, all licenses granted until that time remain valid, i.e. 
+allow the licensee to continue using the SOFTWARE in combination with the unmodified MOA 
+modules.
+
+7. LIABILITY:
+To the maximum extent allowed by applicable law Stiftung SIC shall not be liable for any damages 
+whatsoever (including, without limitation, damages for loss of business profits, business interruption, 
+loss of business information, or other pecuniary loss) arising out of the use of or inability to use the 
+SOFTWARE, even if Stiftung SIC has been advised of the possibility of such damages.
+
+8. WAIVER:
+Invalidity, on legal grounds, of any term of this Agreement does not render the Agreement as a whole 
+invalid.
+
+9. GOVERNING LAW, ARBITRATION:
+This Agreement is governed by Austrian law.
diff --git a/LICENSE-2.0.txt b/LICENSE-2.0.txt
new file mode 100644
index 000000000..d64569567
--- /dev/null
+++ b/LICENSE-2.0.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/NOTICE.txt b/NOTICE.txt
new file mode 100644
index 000000000..1296eeb2c
--- /dev/null
+++ b/NOTICE.txt
@@ -0,0 +1,16 @@
+MOA-ID/SP/SS
+Copyright 2008 Federal Chancellery Austria
+
+This product includes software originally developed at the
+Austrian Federal Computing Centre (BRZ - Bundesrechenzentrum,
+www.brz.gv.at) and the Federal Chancellery Austria (Stabsstelle
+IKT-Strategie des Bundes, Bundeskanzleramt, 
+www.digitales.oesterreich.gv.at).
+
+This product includes software developed by third parties
+and provided under an open source license (www.opensource.org).
+
+This product includes software "IAIK MOA" provided by
+Stiftung Secure Information and Communication Technologies SIC 
+(www.sic.st). This software has been licensed under the terms
+and conditions given in "IAIK-LICENSE".
\ No newline at end of file
diff --git a/common/pom.xml b/common/pom.xml
index 39a0c8910..a454acd1f 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -2,12 +2,12 @@
   <parent>
     <groupId>MOA</groupId>
     <artifactId>MOA</artifactId>
-    <version>1.4.3-1</version>
+    <version>1.4.4</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>MOA</groupId>
   <artifactId>moa-common</artifactId>
-  <version>1.4.3-1</version>
+  <version>1.4.4</version>
   <packaging>jar</packaging>
   <name>MOA common library</name>
 
diff --git a/common/src/main/java/at/gv/egovernment/moa/util/Constants.java b/common/src/main/java/at/gv/egovernment/moa/util/Constants.java
index a436c4b23..3851f7fdf 100644
--- a/common/src/main/java/at/gv/egovernment/moa/util/Constants.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/Constants.java
@@ -96,7 +96,7 @@ public interface Constants {
 
   /** Local location of the MOA ID configuration XML schema definition. */
   public static final String MOA_ID_CONFIG_SCHEMA_LOCATION =
-    SCHEMA_ROOT + "MOA-ID-Configuration-1.4.3.xsd";
+    SCHEMA_ROOT + "MOA-ID-Configuration-1.4.4.xsd";
 
   /** URI of the Security Layer 1.0 namespace. */
   public static final String SL10_NS_URI =
diff --git a/common/src/main/resources/resources/schemas/MOA-ID-Configuration-1.4.4.xsd b/common/src/main/resources/resources/schemas/MOA-ID-Configuration-1.4.4.xsd
new file mode 100644
index 000000000..619b9f2df
--- /dev/null
+++ b/common/src/main/resources/resources/schemas/MOA-ID-Configuration-1.4.4.xsd
@@ -0,0 +1,612 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" targetNamespace="http://www.buergerkarte.at/namespaces/moaconfig#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.4.3">
+	<!-- es werden lokale Schemas referenziert für real aufgelöste Schemas bitte ersetzen: http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd -->
+	<xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
+	<xsd:import namespace="http://reference.e-government.gv.at/namespace/persondata/20020228#" schemaLocation="PersonData_20_en_moaWID.xsd"/>
+	<xsd:element name="Configuration">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="LoginType" type="LoginType" default="stateful"/>
+				<xsd:element name="Binding" minOccurs="0">
+					<xsd:simpleType>
+						<xsd:restriction base="xsd:string">
+							<xsd:enumeration value="full"/>
+							<xsd:enumeration value="userName"/>
+							<xsd:enumeration value="none"/>
+						</xsd:restriction>
+					</xsd:simpleType>
+				</xsd:element>
+				<xsd:choice>
+					<xsd:element ref="ParamAuth"/>
+					<xsd:element ref="BasicAuth"/>
+					<xsd:element ref="HeaderAuth"/>
+				</xsd:choice>
+			</xsd:sequence>
+		</xsd:complexType>
+	</xsd:element>
+	<xsd:simpleType name="LoginType">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="stateless"/>
+			<xsd:enumeration value="stateful"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+	<xsd:element name="ParamAuth">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element ref="Parameter" maxOccurs="unbounded"/>
+			</xsd:sequence>
+		</xsd:complexType>
+	</xsd:element>
+	<xsd:element name="Parameter">
+		<xsd:complexType>
+			<xsd:attribute name="Name" type="xsd:token" use="required"/>
+			<xsd:attribute name="Value" type="MOAAuthDataType" use="required"/>
+		</xsd:complexType>
+	</xsd:element>
+	<xsd:element name="BasicAuth">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="UserID" type="MOAAuthDataType"/>
+				<xsd:element name="Password" type="MOAAuthDataType"/>
+			</xsd:sequence>
+		</xsd:complexType>
+	</xsd:element>
+	<xsd:element name="HeaderAuth">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element ref="Header" maxOccurs="unbounded"/>
+			</xsd:sequence>
+		</xsd:complexType>
+	</xsd:element>
+	<xsd:element name="Header">
+		<xsd:complexType>
+			<xsd:attribute name="Name" type="xsd:token" use="required"/>
+			<xsd:attribute name="Value" type="MOAAuthDataType" use="required"/>
+		</xsd:complexType>
+	</xsd:element>
+	<xsd:simpleType name="MOAAuthDataType">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="MOAGivenName"/>
+			<xsd:enumeration value="MOAFamilyName"/>
+			<xsd:enumeration value="MOADateOfBirth"/>
+			<xsd:enumeration value="MOABPK"/>
+			<xsd:enumeration value="MOAWBPK"/>
+			<xsd:enumeration value="MOAPublicAuthority"/>
+			<xsd:enumeration value="MOABKZ"/>
+			<xsd:enumeration value="MOAQualifiedCertificate"/>
+			<xsd:enumeration value="MOAStammzahl"/>
+			<xsd:enumeration value="MOAIdentificationValueType"/>
+			<xsd:enumeration value="MOAIPAddress"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+	<xsd:simpleType name="MOAKeyBoxSelector">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="SecureSignatureKeypair"/>
+			<xsd:enumeration value="CertifiedKeypair"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+	<!--Konfiguration für Authentisierungs- und Proxy-Komponente und Online-Applikation-->
+	<xsd:element name="MOA-IDConfiguration">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="AuthComponent" type="AuthComponentType" minOccurs="0">
+					<xsd:annotation>
+						<xsd:documentation>enthält Parameter der Authentisierungs-Komponente</xsd:documentation>
+					</xsd:annotation>
+				</xsd:element>
+				<xsd:element name="ProxyComponent" minOccurs="0">
+					<xsd:annotation>
+						<xsd:documentation>enthält Konfigurationsparameter der Proxy-Komponente</xsd:documentation>
+					</xsd:annotation>
+					<xsd:complexType>
+						<xsd:sequence>
+							<xsd:element name="AuthComponent">
+								<xsd:annotation>
+									<xsd:documentation>enthält Parameter für die Kommunikation zw. Proxykomponente und Authenttisierungskomponente</xsd:documentation>
+								</xsd:annotation>
+								<xsd:complexType>
+									<xsd:sequence>
+										<xsd:element name="ConnectionParameter" type="ConnectionParameterClientAuthType" minOccurs="0">
+											<xsd:annotation>
+												<xsd:documentation>enthält Parameter für die SOAP-Verbindung von der Proxy-Komponente zur Auth-Komponente (vgl. AuthComponent/MOA-SP/ConnectionParameter)</xsd:documentation>
+											</xsd:annotation>
+										</xsd:element>
+									</xsd:sequence>
+								</xsd:complexType>
+							</xsd:element>
+						</xsd:sequence>
+					</xsd:complexType>
+				</xsd:element>
+				<xsd:element name="OnlineApplication" maxOccurs="unbounded">
+					<xsd:annotation>
+						<xsd:documentation>enthält Parameter für die OA</xsd:documentation>
+					</xsd:annotation>
+					<xsd:complexType>
+						<xsd:complexContent>
+							<xsd:extension base="OnlineApplicationType">
+								<xsd:attribute name="publicURLPrefix" type="xsd:anyURI" use="required"/>
+								<xsd:attribute name="keyBoxIdentifier" type="MOAKeyBoxSelector" use="optional" default="SecureSignatureKeypair"/>
+								<xsd:attribute name="type" use="optional" default="publicService">
+									<xsd:simpleType>
+										<xsd:restriction base="xsd:NMTOKEN">
+											<xsd:enumeration value="businessService"/>
+											<xsd:enumeration value="publicService"/>
+										</xsd:restriction>
+									</xsd:simpleType>
+								</xsd:attribute>
+								<xsd:attribute name="calculateHPI" type="xsd:boolean" use="optional" default="false"/>
+							</xsd:extension>
+						</xsd:complexContent>
+					</xsd:complexType>
+				</xsd:element>
+				<xsd:element name="ChainingModes" minOccurs="0">
+					<xsd:annotation>
+						<xsd:documentation>spezifiziert den Algorithmus ("pkix" oder "chaining") für die Zertifikatspfadvalidierung</xsd:documentation>
+					</xsd:annotation>
+					<xsd:complexType>
+						<xsd:sequence minOccurs="0" maxOccurs="unbounded">
+							<xsd:element name="TrustAnchor">
+								<xsd:annotation>
+									<xsd:documentation>ein vom SystemDefaultMode abweichender ChiningMode kann für jeden TrustAnchor gesetzt werden</xsd:documentation>
+								</xsd:annotation>
+								<xsd:complexType>
+									<xsd:complexContent>
+										<xsd:extension base="dsig:X509IssuerSerialType">
+											<xsd:attribute name="mode" type="ChainingModeType" use="required"/>
+										</xsd:extension>
+									</xsd:complexContent>
+								</xsd:complexType>
+							</xsd:element>
+						</xsd:sequence>
+						<xsd:attribute name="systemDefaultMode" type="ChainingModeType" use="optional" default="pkix"/>
+					</xsd:complexType>
+				</xsd:element>
+				<xsd:element name="TrustedCACertificates" type="xsd:anyURI" minOccurs="0">
+					<xsd:annotation>
+						<xsd:documentation>verweist auf ein Verzeichnis, das vertrauenswürdige CA (Zwischen-CA, Wurzel-CA) Zertifikate enthält.</xsd:documentation>
+					</xsd:annotation>
+				</xsd:element>
+				<xsd:element name="GenericConfiguration" minOccurs="0" maxOccurs="unbounded">
+					<xsd:complexType>
+						<xsd:attribute name="name" use="required">
+							<xsd:simpleType>
+								<xsd:restriction base="xsd:string">
+									<xsd:enumeration value="DirectoryCertStoreParameters.RootDir"/>
+									<xsd:enumeration value="AuthenticationSession.TimeOut"/>
+									<xsd:enumeration value="AuthenticationData.TimeOut"/>
+									<xsd:enumeration value="TrustManager.RevocationChecking"/>
+									<xsd:enumeration value="FrontendServlets.EnableHTTPConnection"/>
+									<xsd:enumeration value="FrontendServlets.DataURLPrefix"/>
+									<xsd:enumeration value="AuthenticationServer.KeepAssertion"/>
+									<xsd:enumeration value="AuthenticationServer.WriteAssertionToFile"/>
+									<xsd:enumeration value="AuthenticationServer.SourceID"/>
+								</xsd:restriction>
+							</xsd:simpleType>
+						</xsd:attribute>
+						<xsd:attribute name="value" type="xsd:string" use="required"/>
+					</xsd:complexType>
+				</xsd:element>
+			</xsd:sequence>
+		</xsd:complexType>
+	</xsd:element>
+	<xsd:complexType name="AuthComponentType">
+		<xsd:sequence>
+			<xsd:element name="BKUSelection" minOccurs="0">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="ConnectionParameter" type="ConnectionParameterServerAuthType"/>
+					</xsd:sequence>
+					<xsd:attribute name="BKUSelectionAlternative" type="BKUSelectionType" use="optional" default="HTMLComplete"/>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:element name="Templates" type="TemplatesType" minOccurs="0"/>
+			<xsd:element name="SecurityLayer">
+				<xsd:annotation>
+					<xsd:documentation>enthält Parameter für die Kommunikation mit dem Security-Layer</xsd:documentation>
+				</xsd:annotation>
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="TransformsInfo" type="TransformsInfoType" maxOccurs="unbounded"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:element name="MOA-SP">
+				<xsd:annotation>
+					<xsd:documentation>enthält Konfiguratiosnparameter für die Kommunikation mit dem MOA SP Modul</xsd:documentation>
+				</xsd:annotation>
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="ConnectionParameter" type="ConnectionParameterClientAuthType" minOccurs="0">
+							<xsd:annotation>
+								<xsd:documentation>enthält Parameter für die SOAP-Verbindung von der AUTH-Komponente zu MOA-SP; das Attribut URL enthält den Endpunkt des Server; wird das Schema "https" verwendet müssen die Kind-Elemente angegeben werden; wird das Schema "http" verwendet dürfen keine Kind-Elemente angegeben werden; wird das Element nicht verwendet dann wird MOA-SP über das API aufgerufen</xsd:documentation>
+							</xsd:annotation>
+						</xsd:element>
+						<xsd:element name="VerifyIdentityLink">
+							<xsd:annotation>
+								<xsd:documentation>enthält Parameter für die Überprüfung der Personenbindung</xsd:documentation>
+							</xsd:annotation>
+							<xsd:complexType>
+								<xsd:sequence>
+									<xsd:element ref="TrustProfileID"/>
+								</xsd:sequence>
+							</xsd:complexType>
+						</xsd:element>
+						<xsd:element name="VerifyAuthBlock">
+							<xsd:annotation>
+								<xsd:documentation>enthält Parameter für die Überprüfung des AUTH-Blocks</xsd:documentation>
+							</xsd:annotation>
+							<xsd:complexType>
+								<xsd:sequence>
+									<xsd:element ref="TrustProfileID"/>
+									<xsd:element name="VerifyTransformsInfoProfileID" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+								</xsd:sequence>
+							</xsd:complexType>
+						</xsd:element>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:element name="IdentityLinkSigners" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>enthält Informationen über akzeptierte Signers des IdentityLinks</xsd:documentation>
+				</xsd:annotation>
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="X509SubjectName" type="xsd:string" maxOccurs="unbounded">
+							<xsd:annotation>
+								<xsd:documentation>akzeptierte Signer des IdentityLinks werden per X509SubjectName (Kodierung nach RFC 2253) identifiziert</xsd:documentation>
+							</xsd:annotation>
+						</xsd:element>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:element name="VerifyInfoboxes" type="VerifyInfoboxesType" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>enthält Defaultparameter für die Überprüfung weiterer Infoboxen</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:complexType name="TransformsInfoType">
+		<xsd:annotation>
+			<xsd:documentation>das Attribut filename verweist auf eine Datei mit globalem Element TransformsInfo vom Typ sl10:TransformsInfo; diese TransformsInfo werden in den CreateXMLSignatureRequest für die Signatur des AUTH-Blocks inkludiert</xsd:documentation>
+		</xsd:annotation>
+		<xsd:attribute name="filename" type="xsd:anyURI" use="required"/>
+	</xsd:complexType>
+	<xsd:complexType name="TemplatesType">
+		<xsd:sequence>
+			<xsd:element name="BKUSelectionTemplate" type="TemplateType" minOccurs="0"/>
+			<xsd:element name="Template" type="TemplateType" minOccurs="0"/>
+			<xsd:element name="InputProcessorSignTemplate" type="TemplateType" minOccurs="0"/>
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:complexType name="TemplateType">
+		<xsd:annotation>
+			<xsd:documentation>das Attribut URL spezifiziert die Lage des Templates</xsd:documentation>
+		</xsd:annotation>
+		<xsd:attribute name="URL" type="xsd:anyURI" use="required"/>
+	</xsd:complexType>
+	<xsd:complexType name="VerifyInfoboxesType">
+		<xsd:annotation>
+			<xsd:documentation>Verifikation zusätzlicher Infoboxen</xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="DefaultTrustProfile" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Optionales DefaultTrustprofil für die Überprüfung aller weiteren Infoboxen</xsd:documentation>
+				</xsd:annotation>
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element ref="TrustProfileID"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:element name="Infobox" type="InfoboxType" minOccurs="0" maxOccurs="unbounded">
+				<xsd:annotation>
+					<xsd:documentation>Parameter für Überprüfung weiterer Infoboxen</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:complexType name="InfoboxType">
+		<xsd:annotation>
+			<xsd:documentation>Parameter zur Überprüfung einzelner Infoboxen</xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="FriendlyName" type="xsd:string" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>optionalervName, der für Fehlermeldungen verwendet werden soll; z.B.: "Stellvertretungen" für "Mandates"; fehlt dieser Parameter, dann wird das Identifier-Attribut verwendet</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="TrustProfileID" type="xsd:string" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>TrustProfil, das für die Überprüfung der Infobox verwendet werden soll</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="ValidatorClass" type="xsd:string" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Validatorklasse, die für die Prüfung der Infobox verwendet werden soll; muss gesetzt werden, wenn Package- und Klassenname vom Default Package- und Klassennamen abweichen</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="SchemaLocations" type="SchemaLocationType" minOccurs="0"/>
+			<xsd:element name="ApplicationSpecificParameters" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Infobox spezifische Parameter, die der jeweiligen Prüfapplikation übergeben werden</xsd:documentation>
+				</xsd:annotation>
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:any namespace="##any" processContents="skip" maxOccurs="unbounded"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:element name="ParepSpecificParameters" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Infobox spezifische Parameter, die der Prüfapplikation für berufliche Parteienvertretung übergeben werden. Dies ist logisch Teil der ApplicationSpecificParameters, kann jedoch aufgrund der Strukturierung validierend geparst werden und dadurch wird eine funktionierende Konfiguration bei Programmstart garantiert.</xsd:documentation>
+				</xsd:annotation>
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element ref="EnableInfoboxValidator" minOccurs="0">
+							<xsd:annotation>
+								<xsd:documentation>Falls Infoboxinhalte für die berufliche Parteienvertretung in der Vollmachten Infobox "mandates" abgelegt werden und Vertretung für berufliche Parteienvertreter aktiviert ist, so kann mit diesem Schalter die Vollmachtsprüfung für normale Vollmachten deaktiviert werden. Damit wird erreicht, dass mittels der Vollmachten Infobox ausschließlich berufliche Parteienvertretung aktiviert ist. Dieser Schalter ist nur für die Vollmachten Infobox "mandates" relevant.</xsd:documentation>
+							</xsd:annotation>
+						</xsd:element>
+						<xsd:element name="PartyRepresentation" type="PartyRepresentationType">
+							<xsd:annotation>
+								<xsd:documentation>Eigentlicher Konfigurationsteil für berufliche Parteienvertretung</xsd:documentation>
+							</xsd:annotation>
+						</xsd:element>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+		</xsd:sequence>
+		<xsd:attribute name="Identifier" type="xsd:string" use="required"/>
+		<xsd:attribute name="required" type="xsd:boolean" use="optional" default="false"/>
+		<xsd:attribute name="provideStammzahl" type="xsd:boolean" use="optional" default="false"/>
+		<xsd:attribute name="provideIdentityLink" type="xsd:boolean" use="optional" default="false"/>
+	</xsd:complexType>
+	<xsd:complexType name="SchemaLocationType">
+		<xsd:annotation>
+			<xsd:documentation>Spezifiziert die Lage von XML Schemas</xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="Schema" maxOccurs="unbounded">
+				<xsd:complexType>
+					<xsd:attribute name="namespace" type="xsd:anyURI" use="required"/>
+					<xsd:attribute name="schemaLocation" type="xsd:anyURI" use="required"/>
+				</xsd:complexType>
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:complexType name="ProxyComponentType"/>
+	<xsd:complexType name="OnlineApplicationType">
+		<xsd:sequence>
+			<xsd:element name="AuthComponent" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>enthält Parameter über die OA, die die Authentisierungs-Komponente betreffen</xsd:documentation>
+				</xsd:annotation>
+				<xsd:complexType>
+					<xsd:sequence>
+						<!--xsd:element name="IdentificationNumber" minOccurs="0">
+							<xsd:complexType>
+								<xsd:sequence>
+									<xsd:element ref="pr:AbstractSimpleIdentification"/>
+								</xsd:sequence>
+							</xsd:complexType>
+						</xsd:element-->
+						<xsd:element name="IdentificationNumber" minOccurs="0">
+							<xsd:complexType>
+								<xsd:choice>
+									<xsd:element ref="pr:Firmenbuchnummer"/>
+									<xsd:element ref="pr:ZMRzahl"/>
+									<xsd:element ref="pr:Vereinsnummer"/>
+									<xsd:element ref="pr:ERJPZahl"/>
+									<xsd:element name="AnyNumber">
+										<xsd:complexType>
+											<xsd:simpleContent>
+												<xsd:extension base="xsd:string">
+													<xsd:attribute name="Identifier" type="xsd:string" use="required"/>
+												</xsd:extension>
+											</xsd:simpleContent>
+										</xsd:complexType>
+									</xsd:element>
+								</xsd:choice>
+							</xsd:complexType>
+						</xsd:element>
+						<xsd:element name="Templates" type="TemplatesType" minOccurs="0"/>
+						<xsd:element name="TransformsInfo" type="TransformsInfoType" minOccurs="0" maxOccurs="unbounded"/>
+						<xsd:element name="VerifyInfoboxes" type="VerifyInfoboxesType" minOccurs="0"/>
+					</xsd:sequence>
+					<xsd:attribute name="slVersion" use="optional" default="1.2">
+						<xsd:simpleType>
+							<xsd:restriction base="xsd:string">
+								<xsd:enumeration value="1.1"/>
+								<xsd:enumeration value="1.2"/>
+							</xsd:restriction>
+						</xsd:simpleType>
+					</xsd:attribute>
+					<xsd:attribute name="provideStammzahl" type="xsd:boolean" use="optional" default="false"/>
+					<xsd:attribute name="provideAUTHBlock" type="xsd:boolean" use="optional" default="false"/>
+					<xsd:attribute name="provideIdentityLink" type="xsd:boolean" use="optional" default="false"/>
+					<xsd:attribute name="provideCertificate" type="xsd:boolean" use="optional" default="false"/>
+					<!--xsd:element ref="pr:AbstractSimpleIdentification" minOccurs="0" maxOccurs="1"/-->
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:element name="ProxyComponent" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>enthält Parameter über die OA, die die Proxy-Komponente betreffen</xsd:documentation>
+				</xsd:annotation>
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="ConnectionParameter" type="ConnectionParameterClientAuthType">
+							<xsd:annotation>
+								<xsd:documentation>enthält Parameter über die OA, die die Proxy-Komponente betreffen</xsd:documentation>
+							</xsd:annotation>
+						</xsd:element>
+					</xsd:sequence>
+					<xsd:attribute name="configFileURL" type="xsd:anyURI" use="optional"/>
+					<xsd:attribute name="sessionTimeOut" type="xsd:int" use="optional"/>
+					<xsd:attribute name="loginParameterResolverImpl" type="xsd:string" use="optional"/>
+					<xsd:attribute name="loginParameterResolverConfiguration" type="xsd:string" use="optional"/>
+					<xsd:attribute name="connectionBuilderImpl" type="xsd:string" use="optional"/>
+				</xsd:complexType>
+			</xsd:element>
+			<!--xsd:element ref="pr:CorporateBody" minOccurs="0" maxOccurs="1"/-->
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:complexType name="ConnectionParameterServerAuthType">
+		<xsd:sequence>
+			<xsd:element name="AcceptedServerCertificates" type="xsd:anyURI" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>URL zu einem Verzeichnis, das akzeptierte Server-Zertifikate der TLS-Verbindung enthält (keine CA-Zertifikate)</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+		<xsd:attribute name="URL" type="xsd:anyURI" use="required"/>
+	</xsd:complexType>
+	<xsd:complexType name="ConnectionParameterClientAuthType">
+		<xsd:complexContent>
+			<xsd:extension base="ConnectionParameterServerAuthType">
+				<xsd:sequence>
+					<xsd:element name="ClientKeyStore" minOccurs="0">
+						<xsd:annotation>
+							<xsd:documentation>URL zu einem KeyStore, der den privaten Schlüssel, der für die TLS-Client-Authentisierung verwendet wird, enthält</xsd:documentation>
+						</xsd:annotation>
+						<xsd:complexType>
+							<xsd:simpleContent>
+								<xsd:extension base="xsd:anyURI">
+									<xsd:attribute name="password" type="xsd:string" use="optional"/>
+								</xsd:extension>
+							</xsd:simpleContent>
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="TrustProfileID" type="xsd:string"/>
+	<xsd:simpleType name="ChainingModeType">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="chaining"/>
+			<xsd:enumeration value="pkix"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+	<xsd:simpleType name="BKUSelectionType">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="HTMLComplete"/>
+			<xsd:enumeration value="HTMLSelect"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+	<xsd:element name="CompatibilityMode" default="false">
+		<xsd:simpleType>
+			<xsd:restriction base="xsd:boolean"/>
+		</xsd:simpleType>
+	</xsd:element>
+	<xsd:element name="EnableInfoboxValidator" default="true">
+		<xsd:simpleType>
+			<xsd:restriction base="xsd:boolean"/>
+		</xsd:simpleType>
+	</xsd:element>
+	<xsd:element name="AlwaysShowForm" default="false">
+		<xsd:annotation>
+			<xsd:documentation>Soll nicht nur bei leerer oder standardisierter Vollmacht mit unvollständigen Daten, sondern beispielsweise zu Kontrollzwecken das Eingabeformular immer angezeigt werden, wenn ein Einschreiten durch berufliche Parteienvertretung geschieht so kann dies mittels dieses Schalters veranlasst werden</xsd:documentation>
+		</xsd:annotation>
+		<xsd:simpleType>
+			<xsd:restriction base="xsd:boolean"/>
+		</xsd:simpleType>
+	</xsd:element>
+	<xsd:complexType name="InputProcessorType">
+		<xsd:simpleContent>
+			<xsd:extension base="xsd:string">
+				<xsd:attribute name="template" type="xsd:anyURI" use="optional">
+					<xsd:annotation>
+						<xsd:documentation>Das Attribut spezifiziert die Lage des Templates, welches der InputProcessor zur Darstellung des Eingabeformulars nutzen soll</xsd:documentation>
+					</xsd:annotation>
+				</xsd:attribute>
+			</xsd:extension>
+		</xsd:simpleContent>
+	</xsd:complexType>
+	<xsd:complexType name="PartyRepresentationType">
+		<xsd:sequence>
+			<xsd:element name="InputProcessor" type="InputProcessorType" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Default InputProcessor. Konfiguration eines vom Standardprozess abweichenden Verarbeitungsvorgangs bei der beruflichen Parteienvertretung. Der Wert dieses Elements ist der vollständige Klassenname des InputProzessors</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element ref="AlwaysShowForm" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Default Wert für Formularanzeige. Soll nicht nur bei leerer oder standardisierter Vollmacht mit unvollständigen Daten, sondern beispielsweise zu Kontrollzwecken das Eingabeformular zur vervollständigung der Vertretenendaten immer angezeigt werden, wenn ein Einschreiten durch berufliche Parteienvertretung geschieht so kann dies mittels dieses Schalters veranlasst werden</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="ConnectionParameter" type="ConnectionParameterClientAuthType" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Default Verbindungsparameter zum SZR-Gateway (für den EGIZ-Demonstrator im internen Netzwerk: https://129.27.142.5:8443/szr-gateway/services/MandateCreation)</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="PartyRepresentative" type="PartyRepresentativeType" minOccurs="0" maxOccurs="unbounded">
+				<xsd:annotation>
+					<xsd:documentation>Falls keine speziellen beruflichen ParteienvertreterInnen definiert sind (Element kommt nicht vor), werden ausschließlich standardisierte Vollmachten mit einer MandateID="*" akzeptiert</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:complexType name="PartyRepresentativeType">
+		<xsd:sequence>
+			<xsd:element name="InputProcessor" type="InputProcessorType" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Konfiguration eines vom Standardprozess abweichenden Verarbeitungsvorgangs bei der beruflichen Parteienvertretung. Der Wert dieses Elements ist der vollständige Klassenname des InputProzessors</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element ref="AlwaysShowForm" minOccurs="0"/>
+			<xsd:element name="ConnectionParameter" type="ConnectionParameterClientAuthType" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Optionale Verbindungsparameter zu speziellem (SZR-)Gateway</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+		<xsd:attribute name="oid" use="required">
+			<xsd:annotation>
+				<xsd:documentation>OID der Parteienvertretung lt. "Object Identifier der öffentlichen Verwaltung" - Konvention, Empfehlung. Diese ID muss mit der MandateID der übermittelten standardisierten Vollmacht übereinstimmen. Eine Parteienvertretung für standardisierte Vollmachten mit der MandateID "*" muss nicht definiert werden und erlaubt eine allgemeine berufliche Parteienvertretung mit Standardtexten. In anderen Fällen ist eine erlaubte OID mitttels dieses Attributs zu definieren</xsd:documentation>
+			</xsd:annotation>
+			<!--xsd:simpleType>
+				<xsd:restriction/>
+				<xsd:restriction base="xsd:string">
+					<xsd:enumeration value="1.2.40.0.10.3.1"/>
+					<xsd:enumeration value="1.2.40.0.10.3.2"/>
+					<xsd:enumeration value="1.2.40.0.10.3.3"/>
+					<xsd:enumeration value="1.2.40.0.10.3.10"/>
+					<xsd:enumeration value="1.2.40.0.10.3.10.IdentifiedVoiceChannel"/>
+				</xsd:restriction>
+			</xsd:simpleType-->
+		</xsd:attribute>
+		<xsd:attribute name="representPhysicalParty" use="optional" default="false">
+			<xsd:annotation>
+				<xsd:documentation>Legt fest, ob berufliche Parteienvertretung für natürliche Personen erlaubt ist</xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:restriction base="xsd:boolean"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="representCorporateParty" use="optional" default="false">
+			<xsd:annotation>
+				<xsd:documentation>Legt fest, ob berufliche Parteienvertretung für juristische Personen erlaubt ist (welche z.B. ein Organwalter nicht vertreten darf und dieser Wert aus diesem Grund dort false sein muss)</xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:restriction base="xsd:boolean"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="representationText" use="optional">
+			<xsd:annotation>
+				<xsd:documentation>Beschreibender Text, der an Stelle des Standardtexts bei der Signatur der Anmeldedaten im Falle einer vorliegenden beruflichen Parteienvertretung zur Signatur vorgelegt wird</xsd:documentation>
+			</xsd:annotation>
+			<!--xsd:simpleType>
+				<xsd:restriction/>
+				<xsd:restriction base="xsd:string">
+					<xsd:enumeration value="berufsmäßige(r) Parteienvertreter(in) mit Notariatseigenschaft"/>
+					<xsd:enumeration value="berufsmäßige(r) Parteienvertreter(in) mit Rechtsanwaltseigenschaft"/>
+					<xsd:enumeration value="berufsmäßige(r) Parteienvertreter(in) mit Ziviltechnikerinneneigenschaft)"/>
+					<xsd:enumeration value="Organwalter"/>
+					<xsd:enumeration value="Parteienvertreter(in) über einen identifizierten Sprachkanal"/>
+				</xsd:restriction>
+			</xsd:simpleType-->
+		</xsd:attribute>
+	</xsd:complexType>
+</xsd:schema>
diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml
index 98c02cc1a..165bedf72 100644
--- a/id/assembly-auth.xml
+++ b/id/assembly-auth.xml
@@ -45,8 +45,13 @@
 			</includes>
 		</fileSet>
 		<fileSet>
-			<directory>${basedir}/licenses</directory>
+			<directory>${basedir}</directory>
 			<outputDirectory>/</outputDirectory>
+			<includes>
+				<include>LICENSE-2.0.txt</include>
+				<include>NOTICE.txt</include>
+				<include>IAIK-LICENSE.txt</include>
+			</includes>
 		</fileSet>
 	</fileSets>
 
diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml
index deed772eb..0f7af5491 100644
--- a/id/assembly-proxy.xml
+++ b/id/assembly-proxy.xml
@@ -31,8 +31,13 @@
 			</includes>
 		</fileSet>
 		<fileSet>
-			<directory>${basedir}/licenses</directory>
+			<directory>${basedir}</directory>
 			<outputDirectory>/</outputDirectory>
+			<includes>
+				<include>LICENSE-2.0.txt</include>
+				<include>NOTICE.txt</include>
+				<include>IAIK-LICENSE.txt</include>
+			</includes>
 		</fileSet>
 	</fileSets>
 
@@ -70,6 +75,17 @@
 				<unpack>false</unpack>
 			</binaries>
 		</moduleSet>
+		<moduleSet>
+			<includes>
+				<include>MOA:moa-id-oa</include>
+			</includes>
+			<binaries>
+				<includeDependencies>true</includeDependencies>
+				<outputDirectory>/</outputDirectory>
+				<outputFileNameMapping>oa.${extension}</outputFileNameMapping>
+				<unpack>false</unpack>
+			</binaries>
+		</moduleSet>
 		<moduleSet>
 			<includes>
 				<include>MOA.id.server:moa-id-lib</include>
diff --git a/id/history.txt b/id/history.txt
index 95ea0c78d..1aede7deb 100644
--- a/id/history.txt
+++ b/id/history.txt
@@ -23,6 +23,14 @@ Fixes:
   adaptiertes Anfrageformat. MOA-ID wurde im Zuge dessen auf dieses Anfrage-
   format umgestellt (Version SZR-GW-0.0.2.xsd).
 
+- Fixed Bug #333 (http://egovlabs.gv.at/tracker/index.php?func=detail&aid=333&group_id=6&atid=105)
+
+- Fixed Bug #332 (http://egovlabs.gv.at/tracker/index.php?func=detail&aid=332&group_id=6&atid=105)
+
+- IAIK Libraries aktualisiert:
+	iaik-moa:           Version 1.24
+	iaik-ixsil:			Version 1.2.2.4
+  
 =====
 Version MOA-ID 1.4.3-1 (Bugfix Release): Änderungen seit Version MOA-ID 1.4.3:
 
diff --git a/id/pom.xml b/id/pom.xml
index 0015a9e79..d7763f96f 100644
--- a/id/pom.xml
+++ b/id/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <groupId>MOA</groupId>
         <artifactId>MOA</artifactId>
-        <version>1.4.3-1</version>
+        <version>1.4.4</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>MOA</groupId>
     <artifactId>id</artifactId>
     <packaging>pom</packaging>
-    <version>1.4.3-1</version>
+    <version>1.4.4</version>
     <name>MOA ID</name>
 
     <modules>
diff --git a/id/readme_1.4.4.txt b/id/readme_1.4.4.txt
new file mode 100644
index 000000000..4ac757250
--- /dev/null
+++ b/id/readme_1.4.4.txt
@@ -0,0 +1,233 @@
+===============================================================================
+MOA ID Version 1.4.4 - Wichtige Informationen zur Installation
+===============================================================================
+
+-------------------------------------------------------------------------------
+A. Neuerungen/Änderungen
+-------------------------------------------------------------------------------
+
+Mit MOA ID Version 1.4.4 wurden folgende Neuerungen eingeführt, die jetzt 
+erstmals in der Veröffentlichung enthalten sind (siehe auch history.txt im 
+gleichen Verzeichnis):
+
+- Bei der beruflichen Parteienvertretung wurde das Stammzahlenregister in den 
+  Beispielkonfigurationen vorkonfiguriert.
+  
+- MOA-ID erlaubt ab sofort Load-Balancing. Dies wird durch die Konfigurations-
+  möglichkeit der Source-ID für das SAML-Artifact gewährleistet. Das Border-
+  Gateway kann dann anhand dieser Kennung an den zuständigen Server zur Abholung
+  der SAML-Assertion weiterleiten. Über den Konfigurationsparameter
+  <GenericConfiguration name="AuthenticationServer.SourceID" value="Cluster-A"/>
+  kann die authURL bei der Kodierung des SAML-Artifakts durch eine fix 
+  definierte URI (z.B. "Cluster-A") ersetzt werden.
+	
+-------------------------------------------------------------------------------
+B. Durchführung eines Updates
+-------------------------------------------------------------------------------
+
+Es wird generell eine Neuinstallation lt. Handbuch empfohlen! Dennoch ist auch
+eine Aktualisierung bestehender Installationen möglich.
+
+...............................................................................
+B.1 Durchführung eines Updates von Version 1.4.1 oder 1.4.2 (incl. beta 1)
+...............................................................................
+
+1. Stoppen Sie den Tomcat, in dem Ihre bisherige Installation betrieben wird.
+   Fertigen Sie eine Sicherungskopie Ihrer kompletten Tomcat-Installation an.
+
+2. Entpacken Sie die Distribution von MOA ID Auth (moa-id-auth-1.4.4.zip) in
+   ein temporäres Verzeichnis, in weiterer Folge als MOA_ID_AUTH_INST 
+   bezeichnet.   
+
+3. Wechseln Sie in jenes Verzeichnis, das die Webapplikation von MOA ID Auth
+   beinhaltet (für gewöhnlich ist dieses Verzeichnis CATALINA_HOME_ID/webapps,
+   wobei CATALINA_HOME_ID für das Basisverzeichnis der Tomcat-Installation 
+   für MOA ID steht). Löschen Sie darin sowohl die Datei moa-id-auth.war als 
+   auch das komplette Verzeichnis moa-id-auth.
+
+4. Kopieren Sie die Datei MOA_ID_AUTH_INST/moa-id-auth.war nach
+   CATALINA_HOME_ID/webapps.
+
+5. Kopieren Sie die vier Dateien aus dem Verzeichnis  
+   MOA_ID_AUTH_INST/conf/moa-id/transforms in das Verzeichnis transforms Ihres
+   Stammverzeichnisses für die MOA ID Konfiguration (für gewöhnlich lautet
+   dieses Stammverzeichnis CATALINA_HOME_ID/conf/moa-id; in weiterer Folge wird
+   davon ausgegangen).
+
+6. Kopieren Sie die vier Dateien aus dem Verzeichnis 
+   MOA_ID_AUTH_INST/conf/moa-spss/profiles in das Verzeichnis profiles Ihres
+   Stammverzeichnisses für die MOA SPSS Konfiguration (für gewöhnlich lautet
+   dieses Stammverzeichnis CATALINA_HOME_SPSS/conf/moa-spss, wobei 
+   CATALINA_HOME_SPSS für das Basisverzeichnis der Tomcat-Installation 
+   für MOA SPSS steht; wenn Sie MOA SPSS nicht als eigenes Webservice 
+   betreiben, sondern es von MOA ID über die API-Schnittstelle angesprochen
+   wird, lautet dieses Stammverzeichnis für gewöhnlich
+   CATALINA_HOME_ID/conf/moa-spss.
+
+7. Sichern Sie ihre MOA-ID Konfigurationsdatei. Kopieren Sie die 
+   Beispielkonfigurationsdateien aus dem Verzeichnis
+   MOA_ID_AUTH_INST/conf/moa-id/SampleMOA*.xml nach 
+   CATALINA_HOME_ID/conf/moa-id. 
+   Verwenden Sie in Ihrer Installation bereits die Vollmachtenprüfung, so 
+   verschieben Sie bitte in der MOA-ID Installationsdatei das Element 
+   <CompatibilityMode> innerhalb des Konfigurationsteiles für die berufliche 
+   Parteienvertreung (ParepSpecificParameters) unter das Element 
+   ApplicationSpecificParameters.
+
+8. Starten Sie den Tomcat neu, achten Sie auf eventuelle Fehlermeldungen im
+   Logging von MOA ID beim Einlesen der erneuerten Konfiguration.
+
+...............................................................................
+B.2 Durchführung eines Updates von Version 1.3.1, 1.3.2 oder 1.3.3
+...............................................................................
+
+1. Stoppen Sie den Tomcat, in dem Ihre bisherige Installation betrieben wird.
+   Fertigen Sie eine Sicherungskopie Ihrer kompletten Tomcat-Installation an.
+   
+2. Entpacken Sie die Distribution von MOA ID Auth (moa-id-auth-1.4.4.zip) in
+   ein temporäres Verzeichnis, in weiterer Folge als MOA_ID_AUTH_INST 
+   bezeichnet.
+
+3. Erstellen Sie eine Sicherungskopie aller "iaik*.jar"-Dateien im Verzeichnis
+   JAVA_HOME\jre\lib\ext und löschen Sie diese Dateien danach.
+
+4. Kopieren Sie alle Dateien aus dem Verzeichnis MOA_ID_INST_AUTH\ext in das 
+   Verzeichnis JAVA_HOME\jre\lib\ext.
+
+5. Erstellen Sie eine Sicherungskopie aller Dateien im Verzeichnis 
+   CATALINA_HOME\common\endorsed und löschen Sie die dort eventuell vorhandene 
+   Dateien xmlParserAPIs.jar
+
+6. Kopieren Sie die Dateien aus dem Verzeichnis MOA_ID_INST_AUTH\endorsed
+   in das Verzeichnis CATALINA_HOME\common\endorsed. Überschreiben Sie dabei
+   etwaige gleichnamige Dateien.
+
+7. Wechseln Sie in jenes Verzeichnis, das die Webapplikation von MOA ID Auth
+   beinhaltet (für gewöhnlich ist dieses Verzeichnis CATALINA_HOME_ID/webapps,
+   wobei CATALINA_HOME_ID für das Basisverzeichnis der Tomcat-Installation 
+   für MOA ID steht). Löschen Sie darin sowohl die Datei moa-id-auth.war als 
+   auch das komplette Verzeichnis moa-id-auth.
+
+8. Kopieren Sie die Datei MOA_ID_AUTH_INST/moa-id-auth.war nach
+   CATALINA_HOME_ID/webapps.
+
+9. Kopieren Sie die vier Dateien aus dem Verzeichnis  
+   MOA_ID_AUTH_INST/conf/moa-id/transforms in das Verzeichnis transforms Ihres
+   Stammverzeichnisses für die MOA ID Konfiguration (für gewöhnlich lautet
+   dieses Stammverzeichnis CATALINA_HOME_ID/conf/moa-id; in weiterer Folge wird
+   davon ausgegangen).
+
+10.Kopieren Sie die vier Dateien aus dem Verzeichnis 
+   MOA_ID_AUTH_INST/conf/moa-spss/profiles in das Verzeichnis profiles Ihres
+   Stammverzeichnisses für die MOA SPSS Konfiguration (für gewöhnlich lautet
+   dieses Stammverzeichnis CATALINA_HOME_SPSS/conf/moa-spss, wobei 
+   CATALINA_HOME_SPSS für das Basisverzeichnis der Tomcat-Installation 
+   für MOA SPSS steht; wenn Sie MOA SPSS nicht als eigenes Webservice 
+   betreiben, sondern es von MOA ID über dmie API-Schnittstelle angesprochen
+   wird, lautet dieses Stammverzeichnis für gewöhnlich
+   CATALINA_HOME_ID/conf/moa-spss; in weiterer Folge wird von letzterer 
+   Variante ausgegangen).   
+
+11.Update des Cert-Stores.
+   Kopieren Sie den Inhalt des Verzeichnisses
+   MOA_ID_INST_AUTH\conf\moa-spss\certstore in das Verzeichnis
+   CATALINA_HOME\conf\moa-spss\certstore. Wenn Sie gefragt werden, ob Sie 
+   vorhandene Dateien oder Unterverzeichnisse überschreiben sollen, dann 
+   bejahen sie das.
+
+12.Sollen zusätzliche Templates für ältere Bürgerkartenumgebungen aktiviert
+   werden, öffnen Sie die XML-Konfiguration von MOA ID (für gewöhnlich finden 
+   Sie diese XML-Datei direkt im Stammverzeichnis für die MOA ID Konfiguration, 
+   z.B. CATALINA_HOME_ID/conf/moa-id/SampleMOAIDConfiguration.xml); führen Sie 
+   folgende Modifikationen an der XML-Konfiguration durch:
+   
+   a. Ändern Sie die applikationsübergreifende Konfiguration der AuthBlock
+      Transformationen. Sie finden diese Konfiguration im XML-Element
+      /MOA-IDConfiguration/AuthComponent/SecurityLayer. Fügen Sie zusätzlich zum
+      bisherigen Inhalt dieses Elements (für gewöhnlich ein Element
+      TransformsInfo, dessen Attribut filname den Wert
+      transforms/TransformsInfoAuthBlockText.xml aufweist) ein Element 
+      TransformsInfo an, dessen Attribut filename auf die Datei für ältere BKU 
+      zeigt. Sie können auch auf die vordefinierten Elemente aus den 
+      Musterkonfigurationen dieser Distribution (
+      MOA_ID_AUTH_INST/conf/moa-id/SampleMOAIDConfiguration.xml) zurückgreifen.
+
+   b. Fügen Sie Profilbezeichner für die Transformationsprofile in der
+      Konfiguration für MOA SP an. Sie finden diesen Bezeichner im XML-
+      Element /MOA-IDConfiguration/AuthComponent/MOA-SP/VerifyAuthBlock.
+      Hängen Sie ein Element VerifyTransformsInfoProfileID an, das für die Über-
+      prüfung der Transformation älterer BKU vorgesehen ist.
+      Siehe auch Inhalt des Elements VerifyAuthBlock aus der Musterkonfiguration 
+      dieser Distribution (
+      MOA_ID_AUTH_INST/conf/moa-id/SampleMOAIDConfiguration.xml).
+
+   c. Ändern Sie gegebenenfalls die applikationsspezifische Konfiguration
+      der Authblock-Tranformationen. Führen Sie dazu die folgende Tätigkeit
+      für jedes XML-Element /MOA-IDConfiguration/OnlineApplicaton/AuthComponent
+      durch: Fügen Sie zusätzlich zu einem bestehenden Element TransformsInfo 
+      ein Elemnet TransformsInfo an, das die Transformation für ältere BKU 
+      enthält - gleich wie dies bereits in Schritt a. durchgeführt wurde (wenn 
+      Sie dieses Element nicht vorfinden, oder es auskommentiert ist, muss 
+      Schritt c. nicht durchgeführt werden).
+
+   Öffnen Sie die XML-Konfiguration von MOA SPSS (für gewöhnlich finden Sie 
+   XML-Datei direkt im Stammverzeichnisses für die MOA SPSS Konfiguration, z.B.
+   CATALINA_HOME_ID/conf/moa-spss/SampleMOASPSSConfiguration.xml); führen Sie 
+   folgende Modifikationen an der XML-Konfiguration durch:
+
+   a. Ändern Sie die konfigurierten Profile für die zulässigen Transformationen
+      über die signierten Daten. Sie finden diese Profile am Ende der XML-Konfi-
+      guration von MOA SPSS (Elemente des Namens 
+      cfg:VerifyTransformsInfoProfile). Fügen Sie zusätzlich zu den vorkommenden 
+      Elementen dieses Namens (für gewöhnlich zwei Elemente) zwei weitere 
+      Elemente dieses Namens hinzu, die die Profile für die älteren Bürger-
+      kartenumgebungen aufnehmen - diese sind durch den Namensteil "_deprecated" 
+      gekennzeichnet (siehe auch Musterkonfigurationen dieser Distribution 
+      MOA_ID_AUTH_INST/conf/moa-spss/SampleMOASPSSConfiguration.xml).
+
+13.Update der Trust-Profile. Achten sie bei Case-sensitiven Betriebssystemen auf 
+   die Profilbezeichnungen. Aus trustprofiles wurde trustProfiles.  
+   Wenn Sie Ihre alten Trust-Profile durch die neuen ersetzen wollen, dann gehen  
+   Sie vor, wie in Punkt a). Wenn Sie Ihre eigenen Trust-Profile beibehalten 
+   wollen, dann gehen Sie vor, wie in Punkt b).
+
+   a. Gehen Sie wie folgt vor, um die Trust-Profile auszutauschen:
+
+    1)  Löschen Sie das Verzeichnis CATALINA_HOME\conf\moa-spss\trustprofiles.
+    2)  Kopieren Sie das Verzeichnis 
+        MOA_ID_INST_AUTH\conf\moa-spss\trustProfiles in das Verzeichnis 
+        CATALINA_HOME\conf\moa-spss.
+
+   b. Falls Sie Ihre alten Trust-Profile beibehalten wollen, gehen Sie wie folgt
+      vor, um die Profile auf den aktuellen Stand zu bringen:
+
+    1)  Benennen Sie ein eventuell vorhandenes Verzeichnis trustprofiles in
+        trustProfiles um (vergessen Sie nicht, diese Änderung in Ihrer MOA-SP/SS
+        Konfigurationsdatei ebenfalls zu berücksichtigen und benennen Sie dort 
+        alle gleichartigen Vorkommen von trustprofiles in trustProfiles um)
+
+    2)  Ergänzen Sie ihre Trustprofile durch alle Zertifikate aus den 
+        entsprechenden Profilen im Verzeichnis 
+        MOA_ID_INST_AUTH\conf\moa-spss\trustProfiles, die nicht in Ihren 
+        Profilen enthalten sind. Am einfachsten ist es, wenn Sie den Inhalt der 
+        einzelnen Profile aus der Distribution (
+        MOA_ID_INST_AUTH\conf\moa-spss\trustProfiles) in die entsprechenden 
+        Profile Ihrer Installation (CATALINA_HOME\conf\moa-spss\trustProfiles) 
+        kopieren und dabei die vorhandenen gleichnamigen Zertifikate 
+        überschreiben), also z.B: Kopieren des Inhalts von 
+        MOA_ID_INST_AUTH\conf\moa-spss\trustProfiles\
+        MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten nach 
+        CATALINA_HOME\conf\moa-spss\trustProfiles\
+        MOAIDBuergerkarteAuthentisierungsDatenMitTestkarten usw.
+
+14.Starten Sie den Tomcat neu, achten Sie auf eventuelle Fehlermeldungen im
+   Logging von MOA ID beim Einlesen der erneuerten Konfiguration.
+
+...............................................................................
+B.3 Durchführung eines Updates von einer älteren Version
+...............................................................................
+
+Bitte führen Sie eine Neuinstallation von MOA ID laut Handbuch durch und passen
+Sie die mitgelieferte Musterkonfiguration entsprechend Ihren Bedürfnissen unter 
+Zuhilfenahme Ihrer bisherigen Konfiguration an.
+
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>
diff --git a/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlock.xml b/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlock.xml
index 103e6aaf7..d828ca6b2 100644
--- a/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlock.xml
+++ b/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlock.xml
@@ -1,5 +1,5 @@
 <sl10:TransformsInfo>
-	<dsig:Transforms>
+	<dsig:Transforms xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
 		<dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
 		<dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116">
 			<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#">
diff --git a/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText.xml b/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText.xml
index 0951bd415..4b61025ae 100644
--- a/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText.xml
+++ b/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText.xml
@@ -1,5 +1,5 @@
 <sl10:TransformsInfo>
-	<dsig:Transforms>
+	<dsig:Transforms xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
 		<dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
 		<dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116">
 			<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#">
diff --git a/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText_deprecated.xml b/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText_deprecated.xml
index 2f087aaf6..0da6c3f8e 100644
--- a/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText_deprecated.xml
+++ b/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText_deprecated.xml
@@ -1,5 +1,5 @@
 <sl10:TransformsInfo>
-	<dsig:Transforms>
+	<dsig:Transforms xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
 		<dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
 		<dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116">
 			<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#">
diff --git a/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlock_deprecated.xml b/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlock_deprecated.xml
index 479a12745..802bc6470 100644
--- a/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlock_deprecated.xml
+++ b/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlock_deprecated.xml
@@ -1,5 +1,5 @@
 <sl10:TransformsInfo>
-	<dsig:Transforms>
+	<dsig:Transforms xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
 		<dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
 		<dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116">
 			<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#">
diff --git a/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlock.xml b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlock.xml
index 2f4914e2d..c6a000331 100644
--- a/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlock.xml
+++ b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlock.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<VerifyTransformsInfoProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-	<dsig:Transforms>
+<VerifyTransformsInfoProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
+	<dsig:Transforms xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
 		<dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
 		<dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116">
 			<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#">
diff --git a/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockText.xml b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockText.xml
index 43ee1f704..9fe95dcc9 100644
--- a/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockText.xml
+++ b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockText.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<VerifyTransformsInfoProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-	<dsig:Transforms>
+<VerifyTransformsInfoProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
+	<dsig:Transforms xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
 		<dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
 		<dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116">
 			<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#">
diff --git a/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockText_deprecated.xml b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockText_deprecated.xml
index 885aa766a..89f108020 100644
--- a/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockText_deprecated.xml
+++ b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockText_deprecated.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<VerifyTransformsInfoProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-	<dsig:Transforms>
+<VerifyTransformsInfoProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
+	<dsig:Transforms xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
 		<dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
 		<dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116">
 			<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#">
diff --git a/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlock_deprecated.xml b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlock_deprecated.xml
index e1106942d..8924e0f57 100644
--- a/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlock_deprecated.xml
+++ b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlock_deprecated.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<VerifyTransformsInfoProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-	<dsig:Transforms>
+<VerifyTransformsInfoProfile xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
+	<dsig:Transforms xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
 		<dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
 		<dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116">
 			<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#">
diff --git a/id/server/doc/MOA-ID-Configuration-1.4.4.xsd b/id/server/doc/MOA-ID-Configuration-1.4.4.xsd
new file mode 100644
index 000000000..619b9f2df
--- /dev/null
+++ b/id/server/doc/MOA-ID-Configuration-1.4.4.xsd
@@ -0,0 +1,612 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" targetNamespace="http://www.buergerkarte.at/namespaces/moaconfig#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.4.3">
+	<!-- es werden lokale Schemas referenziert für real aufgelöste Schemas bitte ersetzen: http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd -->
+	<xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
+	<xsd:import namespace="http://reference.e-government.gv.at/namespace/persondata/20020228#" schemaLocation="PersonData_20_en_moaWID.xsd"/>
+	<xsd:element name="Configuration">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="LoginType" type="LoginType" default="stateful"/>
+				<xsd:element name="Binding" minOccurs="0">
+					<xsd:simpleType>
+						<xsd:restriction base="xsd:string">
+							<xsd:enumeration value="full"/>
+							<xsd:enumeration value="userName"/>
+							<xsd:enumeration value="none"/>
+						</xsd:restriction>
+					</xsd:simpleType>
+				</xsd:element>
+				<xsd:choice>
+					<xsd:element ref="ParamAuth"/>
+					<xsd:element ref="BasicAuth"/>
+					<xsd:element ref="HeaderAuth"/>
+				</xsd:choice>
+			</xsd:sequence>
+		</xsd:complexType>
+	</xsd:element>
+	<xsd:simpleType name="LoginType">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="stateless"/>
+			<xsd:enumeration value="stateful"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+	<xsd:element name="ParamAuth">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element ref="Parameter" maxOccurs="unbounded"/>
+			</xsd:sequence>
+		</xsd:complexType>
+	</xsd:element>
+	<xsd:element name="Parameter">
+		<xsd:complexType>
+			<xsd:attribute name="Name" type="xsd:token" use="required"/>
+			<xsd:attribute name="Value" type="MOAAuthDataType" use="required"/>
+		</xsd:complexType>
+	</xsd:element>
+	<xsd:element name="BasicAuth">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="UserID" type="MOAAuthDataType"/>
+				<xsd:element name="Password" type="MOAAuthDataType"/>
+			</xsd:sequence>
+		</xsd:complexType>
+	</xsd:element>
+	<xsd:element name="HeaderAuth">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element ref="Header" maxOccurs="unbounded"/>
+			</xsd:sequence>
+		</xsd:complexType>
+	</xsd:element>
+	<xsd:element name="Header">
+		<xsd:complexType>
+			<xsd:attribute name="Name" type="xsd:token" use="required"/>
+			<xsd:attribute name="Value" type="MOAAuthDataType" use="required"/>
+		</xsd:complexType>
+	</xsd:element>
+	<xsd:simpleType name="MOAAuthDataType">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="MOAGivenName"/>
+			<xsd:enumeration value="MOAFamilyName"/>
+			<xsd:enumeration value="MOADateOfBirth"/>
+			<xsd:enumeration value="MOABPK"/>
+			<xsd:enumeration value="MOAWBPK"/>
+			<xsd:enumeration value="MOAPublicAuthority"/>
+			<xsd:enumeration value="MOABKZ"/>
+			<xsd:enumeration value="MOAQualifiedCertificate"/>
+			<xsd:enumeration value="MOAStammzahl"/>
+			<xsd:enumeration value="MOAIdentificationValueType"/>
+			<xsd:enumeration value="MOAIPAddress"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+	<xsd:simpleType name="MOAKeyBoxSelector">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="SecureSignatureKeypair"/>
+			<xsd:enumeration value="CertifiedKeypair"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+	<!--Konfiguration für Authentisierungs- und Proxy-Komponente und Online-Applikation-->
+	<xsd:element name="MOA-IDConfiguration">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="AuthComponent" type="AuthComponentType" minOccurs="0">
+					<xsd:annotation>
+						<xsd:documentation>enthält Parameter der Authentisierungs-Komponente</xsd:documentation>
+					</xsd:annotation>
+				</xsd:element>
+				<xsd:element name="ProxyComponent" minOccurs="0">
+					<xsd:annotation>
+						<xsd:documentation>enthält Konfigurationsparameter der Proxy-Komponente</xsd:documentation>
+					</xsd:annotation>
+					<xsd:complexType>
+						<xsd:sequence>
+							<xsd:element name="AuthComponent">
+								<xsd:annotation>
+									<xsd:documentation>enthält Parameter für die Kommunikation zw. Proxykomponente und Authenttisierungskomponente</xsd:documentation>
+								</xsd:annotation>
+								<xsd:complexType>
+									<xsd:sequence>
+										<xsd:element name="ConnectionParameter" type="ConnectionParameterClientAuthType" minOccurs="0">
+											<xsd:annotation>
+												<xsd:documentation>enthält Parameter für die SOAP-Verbindung von der Proxy-Komponente zur Auth-Komponente (vgl. AuthComponent/MOA-SP/ConnectionParameter)</xsd:documentation>
+											</xsd:annotation>
+										</xsd:element>
+									</xsd:sequence>
+								</xsd:complexType>
+							</xsd:element>
+						</xsd:sequence>
+					</xsd:complexType>
+				</xsd:element>
+				<xsd:element name="OnlineApplication" maxOccurs="unbounded">
+					<xsd:annotation>
+						<xsd:documentation>enthält Parameter für die OA</xsd:documentation>
+					</xsd:annotation>
+					<xsd:complexType>
+						<xsd:complexContent>
+							<xsd:extension base="OnlineApplicationType">
+								<xsd:attribute name="publicURLPrefix" type="xsd:anyURI" use="required"/>
+								<xsd:attribute name="keyBoxIdentifier" type="MOAKeyBoxSelector" use="optional" default="SecureSignatureKeypair"/>
+								<xsd:attribute name="type" use="optional" default="publicService">
+									<xsd:simpleType>
+										<xsd:restriction base="xsd:NMTOKEN">
+											<xsd:enumeration value="businessService"/>
+											<xsd:enumeration value="publicService"/>
+										</xsd:restriction>
+									</xsd:simpleType>
+								</xsd:attribute>
+								<xsd:attribute name="calculateHPI" type="xsd:boolean" use="optional" default="false"/>
+							</xsd:extension>
+						</xsd:complexContent>
+					</xsd:complexType>
+				</xsd:element>
+				<xsd:element name="ChainingModes" minOccurs="0">
+					<xsd:annotation>
+						<xsd:documentation>spezifiziert den Algorithmus ("pkix" oder "chaining") für die Zertifikatspfadvalidierung</xsd:documentation>
+					</xsd:annotation>
+					<xsd:complexType>
+						<xsd:sequence minOccurs="0" maxOccurs="unbounded">
+							<xsd:element name="TrustAnchor">
+								<xsd:annotation>
+									<xsd:documentation>ein vom SystemDefaultMode abweichender ChiningMode kann für jeden TrustAnchor gesetzt werden</xsd:documentation>
+								</xsd:annotation>
+								<xsd:complexType>
+									<xsd:complexContent>
+										<xsd:extension base="dsig:X509IssuerSerialType">
+											<xsd:attribute name="mode" type="ChainingModeType" use="required"/>
+										</xsd:extension>
+									</xsd:complexContent>
+								</xsd:complexType>
+							</xsd:element>
+						</xsd:sequence>
+						<xsd:attribute name="systemDefaultMode" type="ChainingModeType" use="optional" default="pkix"/>
+					</xsd:complexType>
+				</xsd:element>
+				<xsd:element name="TrustedCACertificates" type="xsd:anyURI" minOccurs="0">
+					<xsd:annotation>
+						<xsd:documentation>verweist auf ein Verzeichnis, das vertrauenswürdige CA (Zwischen-CA, Wurzel-CA) Zertifikate enthält.</xsd:documentation>
+					</xsd:annotation>
+				</xsd:element>
+				<xsd:element name="GenericConfiguration" minOccurs="0" maxOccurs="unbounded">
+					<xsd:complexType>
+						<xsd:attribute name="name" use="required">
+							<xsd:simpleType>
+								<xsd:restriction base="xsd:string">
+									<xsd:enumeration value="DirectoryCertStoreParameters.RootDir"/>
+									<xsd:enumeration value="AuthenticationSession.TimeOut"/>
+									<xsd:enumeration value="AuthenticationData.TimeOut"/>
+									<xsd:enumeration value="TrustManager.RevocationChecking"/>
+									<xsd:enumeration value="FrontendServlets.EnableHTTPConnection"/>
+									<xsd:enumeration value="FrontendServlets.DataURLPrefix"/>
+									<xsd:enumeration value="AuthenticationServer.KeepAssertion"/>
+									<xsd:enumeration value="AuthenticationServer.WriteAssertionToFile"/>
+									<xsd:enumeration value="AuthenticationServer.SourceID"/>
+								</xsd:restriction>
+							</xsd:simpleType>
+						</xsd:attribute>
+						<xsd:attribute name="value" type="xsd:string" use="required"/>
+					</xsd:complexType>
+				</xsd:element>
+			</xsd:sequence>
+		</xsd:complexType>
+	</xsd:element>
+	<xsd:complexType name="AuthComponentType">
+		<xsd:sequence>
+			<xsd:element name="BKUSelection" minOccurs="0">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="ConnectionParameter" type="ConnectionParameterServerAuthType"/>
+					</xsd:sequence>
+					<xsd:attribute name="BKUSelectionAlternative" type="BKUSelectionType" use="optional" default="HTMLComplete"/>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:element name="Templates" type="TemplatesType" minOccurs="0"/>
+			<xsd:element name="SecurityLayer">
+				<xsd:annotation>
+					<xsd:documentation>enthält Parameter für die Kommunikation mit dem Security-Layer</xsd:documentation>
+				</xsd:annotation>
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="TransformsInfo" type="TransformsInfoType" maxOccurs="unbounded"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:element name="MOA-SP">
+				<xsd:annotation>
+					<xsd:documentation>enthält Konfiguratiosnparameter für die Kommunikation mit dem MOA SP Modul</xsd:documentation>
+				</xsd:annotation>
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="ConnectionParameter" type="ConnectionParameterClientAuthType" minOccurs="0">
+							<xsd:annotation>
+								<xsd:documentation>enthält Parameter für die SOAP-Verbindung von der AUTH-Komponente zu MOA-SP; das Attribut URL enthält den Endpunkt des Server; wird das Schema "https" verwendet müssen die Kind-Elemente angegeben werden; wird das Schema "http" verwendet dürfen keine Kind-Elemente angegeben werden; wird das Element nicht verwendet dann wird MOA-SP über das API aufgerufen</xsd:documentation>
+							</xsd:annotation>
+						</xsd:element>
+						<xsd:element name="VerifyIdentityLink">
+							<xsd:annotation>
+								<xsd:documentation>enthält Parameter für die Überprüfung der Personenbindung</xsd:documentation>
+							</xsd:annotation>
+							<xsd:complexType>
+								<xsd:sequence>
+									<xsd:element ref="TrustProfileID"/>
+								</xsd:sequence>
+							</xsd:complexType>
+						</xsd:element>
+						<xsd:element name="VerifyAuthBlock">
+							<xsd:annotation>
+								<xsd:documentation>enthält Parameter für die Überprüfung des AUTH-Blocks</xsd:documentation>
+							</xsd:annotation>
+							<xsd:complexType>
+								<xsd:sequence>
+									<xsd:element ref="TrustProfileID"/>
+									<xsd:element name="VerifyTransformsInfoProfileID" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+								</xsd:sequence>
+							</xsd:complexType>
+						</xsd:element>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:element name="IdentityLinkSigners" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>enthält Informationen über akzeptierte Signers des IdentityLinks</xsd:documentation>
+				</xsd:annotation>
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="X509SubjectName" type="xsd:string" maxOccurs="unbounded">
+							<xsd:annotation>
+								<xsd:documentation>akzeptierte Signer des IdentityLinks werden per X509SubjectName (Kodierung nach RFC 2253) identifiziert</xsd:documentation>
+							</xsd:annotation>
+						</xsd:element>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:element name="VerifyInfoboxes" type="VerifyInfoboxesType" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>enthält Defaultparameter für die Überprüfung weiterer Infoboxen</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:complexType name="TransformsInfoType">
+		<xsd:annotation>
+			<xsd:documentation>das Attribut filename verweist auf eine Datei mit globalem Element TransformsInfo vom Typ sl10:TransformsInfo; diese TransformsInfo werden in den CreateXMLSignatureRequest für die Signatur des AUTH-Blocks inkludiert</xsd:documentation>
+		</xsd:annotation>
+		<xsd:attribute name="filename" type="xsd:anyURI" use="required"/>
+	</xsd:complexType>
+	<xsd:complexType name="TemplatesType">
+		<xsd:sequence>
+			<xsd:element name="BKUSelectionTemplate" type="TemplateType" minOccurs="0"/>
+			<xsd:element name="Template" type="TemplateType" minOccurs="0"/>
+			<xsd:element name="InputProcessorSignTemplate" type="TemplateType" minOccurs="0"/>
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:complexType name="TemplateType">
+		<xsd:annotation>
+			<xsd:documentation>das Attribut URL spezifiziert die Lage des Templates</xsd:documentation>
+		</xsd:annotation>
+		<xsd:attribute name="URL" type="xsd:anyURI" use="required"/>
+	</xsd:complexType>
+	<xsd:complexType name="VerifyInfoboxesType">
+		<xsd:annotation>
+			<xsd:documentation>Verifikation zusätzlicher Infoboxen</xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="DefaultTrustProfile" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Optionales DefaultTrustprofil für die Überprüfung aller weiteren Infoboxen</xsd:documentation>
+				</xsd:annotation>
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element ref="TrustProfileID"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:element name="Infobox" type="InfoboxType" minOccurs="0" maxOccurs="unbounded">
+				<xsd:annotation>
+					<xsd:documentation>Parameter für Überprüfung weiterer Infoboxen</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:complexType name="InfoboxType">
+		<xsd:annotation>
+			<xsd:documentation>Parameter zur Überprüfung einzelner Infoboxen</xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="FriendlyName" type="xsd:string" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>optionalervName, der für Fehlermeldungen verwendet werden soll; z.B.: "Stellvertretungen" für "Mandates"; fehlt dieser Parameter, dann wird das Identifier-Attribut verwendet</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="TrustProfileID" type="xsd:string" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>TrustProfil, das für die Überprüfung der Infobox verwendet werden soll</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="ValidatorClass" type="xsd:string" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Validatorklasse, die für die Prüfung der Infobox verwendet werden soll; muss gesetzt werden, wenn Package- und Klassenname vom Default Package- und Klassennamen abweichen</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="SchemaLocations" type="SchemaLocationType" minOccurs="0"/>
+			<xsd:element name="ApplicationSpecificParameters" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Infobox spezifische Parameter, die der jeweiligen Prüfapplikation übergeben werden</xsd:documentation>
+				</xsd:annotation>
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:any namespace="##any" processContents="skip" maxOccurs="unbounded"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:element name="ParepSpecificParameters" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Infobox spezifische Parameter, die der Prüfapplikation für berufliche Parteienvertretung übergeben werden. Dies ist logisch Teil der ApplicationSpecificParameters, kann jedoch aufgrund der Strukturierung validierend geparst werden und dadurch wird eine funktionierende Konfiguration bei Programmstart garantiert.</xsd:documentation>
+				</xsd:annotation>
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element ref="EnableInfoboxValidator" minOccurs="0">
+							<xsd:annotation>
+								<xsd:documentation>Falls Infoboxinhalte für die berufliche Parteienvertretung in der Vollmachten Infobox "mandates" abgelegt werden und Vertretung für berufliche Parteienvertreter aktiviert ist, so kann mit diesem Schalter die Vollmachtsprüfung für normale Vollmachten deaktiviert werden. Damit wird erreicht, dass mittels der Vollmachten Infobox ausschließlich berufliche Parteienvertretung aktiviert ist. Dieser Schalter ist nur für die Vollmachten Infobox "mandates" relevant.</xsd:documentation>
+							</xsd:annotation>
+						</xsd:element>
+						<xsd:element name="PartyRepresentation" type="PartyRepresentationType">
+							<xsd:annotation>
+								<xsd:documentation>Eigentlicher Konfigurationsteil für berufliche Parteienvertretung</xsd:documentation>
+							</xsd:annotation>
+						</xsd:element>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+		</xsd:sequence>
+		<xsd:attribute name="Identifier" type="xsd:string" use="required"/>
+		<xsd:attribute name="required" type="xsd:boolean" use="optional" default="false"/>
+		<xsd:attribute name="provideStammzahl" type="xsd:boolean" use="optional" default="false"/>
+		<xsd:attribute name="provideIdentityLink" type="xsd:boolean" use="optional" default="false"/>
+	</xsd:complexType>
+	<xsd:complexType name="SchemaLocationType">
+		<xsd:annotation>
+			<xsd:documentation>Spezifiziert die Lage von XML Schemas</xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="Schema" maxOccurs="unbounded">
+				<xsd:complexType>
+					<xsd:attribute name="namespace" type="xsd:anyURI" use="required"/>
+					<xsd:attribute name="schemaLocation" type="xsd:anyURI" use="required"/>
+				</xsd:complexType>
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:complexType name="ProxyComponentType"/>
+	<xsd:complexType name="OnlineApplicationType">
+		<xsd:sequence>
+			<xsd:element name="AuthComponent" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>enthält Parameter über die OA, die die Authentisierungs-Komponente betreffen</xsd:documentation>
+				</xsd:annotation>
+				<xsd:complexType>
+					<xsd:sequence>
+						<!--xsd:element name="IdentificationNumber" minOccurs="0">
+							<xsd:complexType>
+								<xsd:sequence>
+									<xsd:element ref="pr:AbstractSimpleIdentification"/>
+								</xsd:sequence>
+							</xsd:complexType>
+						</xsd:element-->
+						<xsd:element name="IdentificationNumber" minOccurs="0">
+							<xsd:complexType>
+								<xsd:choice>
+									<xsd:element ref="pr:Firmenbuchnummer"/>
+									<xsd:element ref="pr:ZMRzahl"/>
+									<xsd:element ref="pr:Vereinsnummer"/>
+									<xsd:element ref="pr:ERJPZahl"/>
+									<xsd:element name="AnyNumber">
+										<xsd:complexType>
+											<xsd:simpleContent>
+												<xsd:extension base="xsd:string">
+													<xsd:attribute name="Identifier" type="xsd:string" use="required"/>
+												</xsd:extension>
+											</xsd:simpleContent>
+										</xsd:complexType>
+									</xsd:element>
+								</xsd:choice>
+							</xsd:complexType>
+						</xsd:element>
+						<xsd:element name="Templates" type="TemplatesType" minOccurs="0"/>
+						<xsd:element name="TransformsInfo" type="TransformsInfoType" minOccurs="0" maxOccurs="unbounded"/>
+						<xsd:element name="VerifyInfoboxes" type="VerifyInfoboxesType" minOccurs="0"/>
+					</xsd:sequence>
+					<xsd:attribute name="slVersion" use="optional" default="1.2">
+						<xsd:simpleType>
+							<xsd:restriction base="xsd:string">
+								<xsd:enumeration value="1.1"/>
+								<xsd:enumeration value="1.2"/>
+							</xsd:restriction>
+						</xsd:simpleType>
+					</xsd:attribute>
+					<xsd:attribute name="provideStammzahl" type="xsd:boolean" use="optional" default="false"/>
+					<xsd:attribute name="provideAUTHBlock" type="xsd:boolean" use="optional" default="false"/>
+					<xsd:attribute name="provideIdentityLink" type="xsd:boolean" use="optional" default="false"/>
+					<xsd:attribute name="provideCertificate" type="xsd:boolean" use="optional" default="false"/>
+					<!--xsd:element ref="pr:AbstractSimpleIdentification" minOccurs="0" maxOccurs="1"/-->
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:element name="ProxyComponent" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>enthält Parameter über die OA, die die Proxy-Komponente betreffen</xsd:documentation>
+				</xsd:annotation>
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="ConnectionParameter" type="ConnectionParameterClientAuthType">
+							<xsd:annotation>
+								<xsd:documentation>enthält Parameter über die OA, die die Proxy-Komponente betreffen</xsd:documentation>
+							</xsd:annotation>
+						</xsd:element>
+					</xsd:sequence>
+					<xsd:attribute name="configFileURL" type="xsd:anyURI" use="optional"/>
+					<xsd:attribute name="sessionTimeOut" type="xsd:int" use="optional"/>
+					<xsd:attribute name="loginParameterResolverImpl" type="xsd:string" use="optional"/>
+					<xsd:attribute name="loginParameterResolverConfiguration" type="xsd:string" use="optional"/>
+					<xsd:attribute name="connectionBuilderImpl" type="xsd:string" use="optional"/>
+				</xsd:complexType>
+			</xsd:element>
+			<!--xsd:element ref="pr:CorporateBody" minOccurs="0" maxOccurs="1"/-->
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:complexType name="ConnectionParameterServerAuthType">
+		<xsd:sequence>
+			<xsd:element name="AcceptedServerCertificates" type="xsd:anyURI" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>URL zu einem Verzeichnis, das akzeptierte Server-Zertifikate der TLS-Verbindung enthält (keine CA-Zertifikate)</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+		<xsd:attribute name="URL" type="xsd:anyURI" use="required"/>
+	</xsd:complexType>
+	<xsd:complexType name="ConnectionParameterClientAuthType">
+		<xsd:complexContent>
+			<xsd:extension base="ConnectionParameterServerAuthType">
+				<xsd:sequence>
+					<xsd:element name="ClientKeyStore" minOccurs="0">
+						<xsd:annotation>
+							<xsd:documentation>URL zu einem KeyStore, der den privaten Schlüssel, der für die TLS-Client-Authentisierung verwendet wird, enthält</xsd:documentation>
+						</xsd:annotation>
+						<xsd:complexType>
+							<xsd:simpleContent>
+								<xsd:extension base="xsd:anyURI">
+									<xsd:attribute name="password" type="xsd:string" use="optional"/>
+								</xsd:extension>
+							</xsd:simpleContent>
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="TrustProfileID" type="xsd:string"/>
+	<xsd:simpleType name="ChainingModeType">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="chaining"/>
+			<xsd:enumeration value="pkix"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+	<xsd:simpleType name="BKUSelectionType">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="HTMLComplete"/>
+			<xsd:enumeration value="HTMLSelect"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+	<xsd:element name="CompatibilityMode" default="false">
+		<xsd:simpleType>
+			<xsd:restriction base="xsd:boolean"/>
+		</xsd:simpleType>
+	</xsd:element>
+	<xsd:element name="EnableInfoboxValidator" default="true">
+		<xsd:simpleType>
+			<xsd:restriction base="xsd:boolean"/>
+		</xsd:simpleType>
+	</xsd:element>
+	<xsd:element name="AlwaysShowForm" default="false">
+		<xsd:annotation>
+			<xsd:documentation>Soll nicht nur bei leerer oder standardisierter Vollmacht mit unvollständigen Daten, sondern beispielsweise zu Kontrollzwecken das Eingabeformular immer angezeigt werden, wenn ein Einschreiten durch berufliche Parteienvertretung geschieht so kann dies mittels dieses Schalters veranlasst werden</xsd:documentation>
+		</xsd:annotation>
+		<xsd:simpleType>
+			<xsd:restriction base="xsd:boolean"/>
+		</xsd:simpleType>
+	</xsd:element>
+	<xsd:complexType name="InputProcessorType">
+		<xsd:simpleContent>
+			<xsd:extension base="xsd:string">
+				<xsd:attribute name="template" type="xsd:anyURI" use="optional">
+					<xsd:annotation>
+						<xsd:documentation>Das Attribut spezifiziert die Lage des Templates, welches der InputProcessor zur Darstellung des Eingabeformulars nutzen soll</xsd:documentation>
+					</xsd:annotation>
+				</xsd:attribute>
+			</xsd:extension>
+		</xsd:simpleContent>
+	</xsd:complexType>
+	<xsd:complexType name="PartyRepresentationType">
+		<xsd:sequence>
+			<xsd:element name="InputProcessor" type="InputProcessorType" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Default InputProcessor. Konfiguration eines vom Standardprozess abweichenden Verarbeitungsvorgangs bei der beruflichen Parteienvertretung. Der Wert dieses Elements ist der vollständige Klassenname des InputProzessors</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element ref="AlwaysShowForm" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Default Wert für Formularanzeige. Soll nicht nur bei leerer oder standardisierter Vollmacht mit unvollständigen Daten, sondern beispielsweise zu Kontrollzwecken das Eingabeformular zur vervollständigung der Vertretenendaten immer angezeigt werden, wenn ein Einschreiten durch berufliche Parteienvertretung geschieht so kann dies mittels dieses Schalters veranlasst werden</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="ConnectionParameter" type="ConnectionParameterClientAuthType" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Default Verbindungsparameter zum SZR-Gateway (für den EGIZ-Demonstrator im internen Netzwerk: https://129.27.142.5:8443/szr-gateway/services/MandateCreation)</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element name="PartyRepresentative" type="PartyRepresentativeType" minOccurs="0" maxOccurs="unbounded">
+				<xsd:annotation>
+					<xsd:documentation>Falls keine speziellen beruflichen ParteienvertreterInnen definiert sind (Element kommt nicht vor), werden ausschließlich standardisierte Vollmachten mit einer MandateID="*" akzeptiert</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:complexType name="PartyRepresentativeType">
+		<xsd:sequence>
+			<xsd:element name="InputProcessor" type="InputProcessorType" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Konfiguration eines vom Standardprozess abweichenden Verarbeitungsvorgangs bei der beruflichen Parteienvertretung. Der Wert dieses Elements ist der vollständige Klassenname des InputProzessors</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+			<xsd:element ref="AlwaysShowForm" minOccurs="0"/>
+			<xsd:element name="ConnectionParameter" type="ConnectionParameterClientAuthType" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Optionale Verbindungsparameter zu speziellem (SZR-)Gateway</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+		<xsd:attribute name="oid" use="required">
+			<xsd:annotation>
+				<xsd:documentation>OID der Parteienvertretung lt. "Object Identifier der öffentlichen Verwaltung" - Konvention, Empfehlung. Diese ID muss mit der MandateID der übermittelten standardisierten Vollmacht übereinstimmen. Eine Parteienvertretung für standardisierte Vollmachten mit der MandateID "*" muss nicht definiert werden und erlaubt eine allgemeine berufliche Parteienvertretung mit Standardtexten. In anderen Fällen ist eine erlaubte OID mitttels dieses Attributs zu definieren</xsd:documentation>
+			</xsd:annotation>
+			<!--xsd:simpleType>
+				<xsd:restriction/>
+				<xsd:restriction base="xsd:string">
+					<xsd:enumeration value="1.2.40.0.10.3.1"/>
+					<xsd:enumeration value="1.2.40.0.10.3.2"/>
+					<xsd:enumeration value="1.2.40.0.10.3.3"/>
+					<xsd:enumeration value="1.2.40.0.10.3.10"/>
+					<xsd:enumeration value="1.2.40.0.10.3.10.IdentifiedVoiceChannel"/>
+				</xsd:restriction>
+			</xsd:simpleType-->
+		</xsd:attribute>
+		<xsd:attribute name="representPhysicalParty" use="optional" default="false">
+			<xsd:annotation>
+				<xsd:documentation>Legt fest, ob berufliche Parteienvertretung für natürliche Personen erlaubt ist</xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:restriction base="xsd:boolean"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="representCorporateParty" use="optional" default="false">
+			<xsd:annotation>
+				<xsd:documentation>Legt fest, ob berufliche Parteienvertretung für juristische Personen erlaubt ist (welche z.B. ein Organwalter nicht vertreten darf und dieser Wert aus diesem Grund dort false sein muss)</xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:restriction base="xsd:boolean"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="representationText" use="optional">
+			<xsd:annotation>
+				<xsd:documentation>Beschreibender Text, der an Stelle des Standardtexts bei der Signatur der Anmeldedaten im Falle einer vorliegenden beruflichen Parteienvertretung zur Signatur vorgelegt wird</xsd:documentation>
+			</xsd:annotation>
+			<!--xsd:simpleType>
+				<xsd:restriction/>
+				<xsd:restriction base="xsd:string">
+					<xsd:enumeration value="berufsmäßige(r) Parteienvertreter(in) mit Notariatseigenschaft"/>
+					<xsd:enumeration value="berufsmäßige(r) Parteienvertreter(in) mit Rechtsanwaltseigenschaft"/>
+					<xsd:enumeration value="berufsmäßige(r) Parteienvertreter(in) mit Ziviltechnikerinneneigenschaft)"/>
+					<xsd:enumeration value="Organwalter"/>
+					<xsd:enumeration value="Parteienvertreter(in) über einen identifizierten Sprachkanal"/>
+				</xsd:restriction>
+			</xsd:simpleType-->
+		</xsd:attribute>
+	</xsd:complexType>
+</xsd:schema>
diff --git a/id/server/doc/moa_id/id-admin_2.htm b/id/server/doc/moa_id/id-admin_2.htm
index 93976976b..00b2d8907 100644
--- a/id/server/doc/moa_id/id-admin_2.htm
+++ b/id/server/doc/moa_id/id-admin_2.htm
@@ -117,7 +117,7 @@ Projekt <span style="font-size:48pt; ">moa</span>&#160;
           <p id="subtitel">Konfiguration von MOA ID v.1.4</p>
           <p id="block"> Die Konfiguration von MOA ID wird mittels einer XML-basierten
             Konfigurationsdatei, die dem Schema
-            <a href="../MOA-ID-Configuration-1.4.xsd" target="_new">MOA-ID-Configuration-1.4.xsd</a>
+            <a href="../MOA-ID-Configuration-1.4.4.xsd" target="_new">MOA-ID-Configuration-1.4.4.xsd</a>
             entspricht, durchgef&uuml;hrt.
           <p /> Der Ort der Konfigurationsdatei wird im Abschnitt <a href="id-admin_1.htm#deployment">Deployment
             der Web-Applikation in Tomcat</a> beschrieben.
@@ -213,7 +213,7 @@ Projekt <span style="font-size:48pt; ">moa</span>&#160;
                 der Konfigurationsdatei f&uuml;r eine Online-Applikation individuell definierte (lokale)
                 Templates (siehe <a href="#OnlineApplication/AuthComponent/Templates" target="_new">
                 OnlineApplication/AuthComponent/Templates</a>).
-                Das heißt, sind in der Konfigurationsddatei f&uuml;r eine Online-Applikation lokale
+                Das hei&szlig;t, sind in der Konfigurationsddatei f&uuml;r eine Online-Applikation lokale
                 Templates definiert (Element <tt>OnlineApplication/AuthComponent/Templates</tt>), so werden
                 die als global spezifizierten Templates (<tt>AuthComponent/Templates</tt>) f&uuml;r diese
                 OnlineApplikation ignoriert, jedoch f&uuml;r alle anderen Online-Applikationen
@@ -350,7 +350,7 @@ Projekt <span style="font-size:48pt; ">moa</span>&#160;
                   <p id="block"> <b>AuthComponent/VerifyInfoboxes</b>
                     <br />
                     Ab Version 1.4 bietet MOA-ID die M&ouml;glichkeit einer erweiterten Infobox-Validierung,
-                    das heißt, es k&ouml;nnen neben der Personenbindung auch weitere ausgelesene Infoboxen
+                    das hei&szlig;t, es k&ouml;nnen neben der Personenbindung auch weitere ausgelesene Infoboxen
                     validiert werden. Die f&uuml;r die Validierung der Infoboxen notwendigen Parameter
                     k&ouml;nnen &uuml;ber die Konfigurationsdatei durch das <tt>VerifyInfoboxes</tt>
                     Element sowohl <a href="#VerifyInfoboxesAuth">global</a> als auch
@@ -361,7 +361,7 @@ Projekt <span style="font-size:48pt; ">moa</span>&#160;
                     Applikation als <tt>Pr&uuml;fapplikation</tt> bezeichnet.
                     <br />
                     Das <tt>Verifyinfoboxes</tt> Element ist optional und kann fehlen,
-                    wenn keine Infoboxen außer der der Personenbindung validiert werden m&uuml;ssen.
+                    wenn keine Infoboxen au&szlig;er der der Personenbindung validiert werden m&uuml;ssen.
                     <br />
                     Das <tt>VerifyInfoboxes</tt>-Element hat folgende Kind-Elemente:
                     <ul>
@@ -427,7 +427,7 @@ Projekt <span style="font-size:48pt; ">moa</span>&#160;
                             das angibt ob die <i>Online-Applikation</i> die Personenbindung erhalten
                             soll.
                             <br />
-                            <b>Anmerkung 2</b>: Der Pr&uuml;fapplikation werden defaultm&auml;ßig der Vorname,
+                            <b>Anmerkung 2</b>: Der Pr&uuml;fapplikation werden defaultm&auml;&szlig;ig der Vorname,
                             der Familienname, das Geburtsdatum, der Typ der Stammzahl, die Stammzahl
                             (konfigurierbar) und die &ouml;ffentlichen Schl&uuml;ssel aus der Personenbindung
                             &uuml;bergeben. Das Attribut <tt>provideIdentityLink</tt> sollte deshalb
@@ -682,7 +682,7 @@ Projekt <span style="font-size:48pt; ">moa</span>&#160;
                               </ul>
 
                               Die Stammzahl ist jeweils ohne Pr&auml;fix anzugeben, also wird zum Beispiel
-                              die Firmenbuchnummer <tt>FN468924i</tt> folgendermaßen definiert:
+                              die Firmenbuchnummer <tt>FN468924i</tt> folgenderma&szlig;en definiert:
                               <br /> <br />
                               <tt>&lt;pr:Firmenbuchnummer&gt;468924i&lt;/pr:Firmenbuchnummer&gt;</tt>
 				   			  <br /><br />
@@ -707,7 +707,7 @@ Projekt <span style="font-size:48pt; ">moa</span>&#160;
                               wie oben gelten.
                               <br></br>
                               Die Firmenbuchnummer aus obigem Beispiel k&ouml;nnte man nun beispielsweise mit Hilfe das Elements
-                              <tt>AnyNumber</tt> auch folgendermaßen definieren:
+                              <tt>AnyNumber</tt> auch folgenderma&szlig;en definieren:
                               <br></br>
                               <tt>&lt;AnyNumber Identifier="FN"&gt;468924i&lt;/AnyNumber&gt;</tt>
 				   			  <br></br>
@@ -741,7 +741,7 @@ Projekt <span style="font-size:48pt; ">moa</span>&#160;
                             Online-Applikationen unterschiedliche Transformationen zu spezifizieren.
                             Alle &uuml;ber dieses Element definierten Transformationen haben
                             Vorrang gegen&uuml;ber die durch <tt>AuthComponent/SecurityLayer/TransformsInfo</tt>
-                            angegebenen Transformationen. Das heißt, ist f&uuml;r eine
+                            angegebenen Transformationen. Das hei&szlig;t, ist f&uuml;r eine
                             Online-Applikation das Kindelement <tt>AuthComponent/TransformsInfo</tt>
                             vorhanden, so wird f&uuml;r diese Applikation die durch dieses Element
                             spezifizierte Transformation verwendet (das Element kann nat&uuml;rlich
@@ -896,7 +896,7 @@ Projekt <span style="font-size:48pt; ">moa</span>&#160;
                             <tt>https://OA3/</tt> eingetragen.
                             Online-Applikation <tt>OA1</tt> konfiguriert Pr&uuml;fapplikationen f&uuml;r
                             die drei Infoboxen <tt>InfoboxB</tt>, <tt>InfoboxC</tt> und
-                            <tt>InfoboxD</tt>. Das heißt, MOA-ID kann f&uuml;r die Online-Applikation
+                            <tt>InfoboxD</tt>. Das hei&szlig;t, MOA-ID kann f&uuml;r die Online-Applikation
                             <tt>OA1</tt> insgesamt vier Infoboxen &uuml;berpr&uuml;fen: die
                             Paramter f&uuml;r die Infobox <tt>InfoboxA</tt> werden
                             von der entsprechenden global konfigurierten Pr&uuml;applikation
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index c8fc02844..ee3c5fc7f 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/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-lib</artifactId>
 	<packaging>jar</packaging>
-	<version>1.4.3</version>
+	<version>1.4.4</version>
 	<name>MOA ID API</name>
 
 	<properties>
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilder.java
index 290dc429a..fe73ce16b 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilder.java
@@ -46,7 +46,7 @@ public class CreateXMLSignatureRequestBuilder implements Constants {
     "  <{3}:SignatureEnvironment>" + nl +
     "   <{4}:XMLContent>{0}</{4}:XMLContent>" + nl +
     "  </{3}:SignatureEnvironment>" + nl +
-    "  <{3}:SignatureLocation Index=''2''>/saml:Assertion</{3}:SignatureLocation>" + nl +
+    "  <{3}:SignatureLocation xmlns:saml=''" + SAML_NS_URI + "'' Index=''2''>/saml:Assertion</{3}:SignatureLocation>" + nl +
     " </{3}:SignatureInfo>" + nl +
     "</{3}:CreateXMLSignatureRequest>";
   
diff --git a/id/server/pom.xml b/id/server/pom.xml
index 18bfd230c..809aff640 100644
--- a/id/server/pom.xml
+++ b/id/server/pom.xml
@@ -4,14 +4,14 @@
     <parent>
         <groupId>MOA</groupId>
         <artifactId>id</artifactId>
-        <version>1.4.3-1</version>
+        <version>1.4.4</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>MOA.id</groupId>
     <artifactId>moa-id</artifactId>
     <packaging>pom</packaging>
-    <version>1.4.3</version>
+    <version>1.4.4</version>
     <name>MOA ID Server</name>
 
     <modules>
diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 906024d5b..2255d6c01 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>1.4.3</version>
+		<version>1.4.4</version>
 	</parent>
 	
 	<properties>
@@ -13,7 +13,7 @@
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-proxy</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.3</version>
+	<version>1.4.4</version>
 	<name>MOA ID-Proxy WebService</name>
 	
 	<build>
diff --git a/licenses/APACHE-LICENSE-2.0.txt b/licenses/APACHE-LICENSE-2.0.txt
deleted file mode 100644
index d64569567..000000000
--- a/licenses/APACHE-LICENSE-2.0.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/licenses/IAIK-LICENSE.txt b/licenses/IAIK-LICENSE.txt
deleted file mode 100644
index 4fa412cf8..000000000
--- a/licenses/IAIK-LICENSE.txt
+++ /dev/null
@@ -1,108 +0,0 @@
-Stiftung SIC License Agreement for "IAIK MOA"
-
-Valid from December 1st, 2005
-
-The Stiftung SIC
-Stiftung Secure Information and Communication Technologies
-Inffeldgasse16a, A-8010 Graz, Austria, hereafter referred to as "Stiftung SIC", 
-offers to grant licences for the SOFTWARE defined below according to the following conditions:
-
-1. DEFINITIONS
-For the purpose of this Licence Agreement, the following definitions are valid:
-
-a. The term "SOFTWARE" refers to the "IAIK MOA" bundle in any 
-form (object code or other) including documentation. The 
-SOFTWARE is the sole property of Stiftung SIC and protected by 
-Austrian, International Copyright Law, e.g. the Revised Berne 
-Convention, and the US Copyright Act.
-
-b. "IAIK MOA" is distributed in documentation, manuals, and user 
-guides, tools - including any revisions, patches and updates 
-downloaded by the customer.
-
-c."IAIK MOA Runtime Modules" means the runtime object code 
-modules provided with, or derived from the SOFTWARE.
-
-d. "MOA modules" mean the modules for online applications made 
-available by the Austrian Federal Chancellery and they consist of 
-MOA-Signature Creation (MOA-SS), MOA-Signature Verification 
-(MOA-SP) and MOA-Identification (MOA-ID).
-
-2. GRANTING of LICENCES
-
-The licensee is granted as specified below:
-
-o IAIK MOA Runtime License
-Stiftung SIC grants the Licensee a non-exclusive, non-transferable runtime licence to use the 
-"IAIK MOA" modules in the context of unmodified MOA modules. Any attempt to use any parts or 
-the whole IAIK Crypto Toolkits which come bundled together with the MOA modules for any 
-purpose other than accessing these MOA modules by applications, including, but not limited to, 
-the development of applications, the creation of a toolkit, or inclusion in a different toolkit, is not 
-permitted without additional licenses. These licences are not transferable to contractors or any 
-other persons, organisations or companies outside the licensee's organisation without making 
-such persons, organisations or companies explicitly aware of the restrictions of these licenses 
-and such persons, organisations or companies explicitly agree to observe these restrictions.
-
-3. LIMITATIONS for all LICENCES:
-LICENSEES must not attempt to reverse engineer, decompile, disassemble, reverse, translate or in 
-any other manner decode the computer programmes in the IAIK libraries in order to derive the 
-source code there from. 
-
-4. WARRANTY:
-Stiftung SIC guarantees that the SOFTWARE is free of any computer virus or other malicious 
-hidden routines that would intentionally cause damage to or corrupt data, storage media or 
-equipment. For proving the integrity of the SOFTWARE, Stiftung SIC may calculate a SHA-1 hash 
-value over the distribution file and publish it on its web site. It is the duty of the licensee to verify this 
-hash value. If the hash value cannot be verified, Stiftung SIC declines any warranties on that 
-software, and the licensee should immediately (or within 30 days of delivery at the latest), contact 
-Stiftung SIC for verification and reshipment.
-The SOFTWARE is provided "as is" and except for the declaration and warranty stated in this 
-section, Stiftung SIC makes no representations, conditions or warranties, either express or implied, 
-relative to the SOFTWARE or services provided hereunder, including all implied conditions or 
-warranties of merchantability and fitness for a particular purpose and all conditions with respect to 
-intellectual property infringement. Stiftung SIC may, but shall not be obliged to, fix errors in any 
-SOFTWARE.
-
-5. PROPRIETARY INFORMATION and CONFIDENTIALITY:
-The LICENSEE acknowledges that the SOFTWARE remains the property of, and is confidential to, 
-Stiftung SIC and incorporates trade secrets of Stiftung SIC, and that Stiftung SIC shall have the 
-exclusive right to any copyrights or patents in respect of the SOFTWARE. The LICENSEE agrees to 
-maintain the confidentiality of the SOFTWARE.
-The LICENSEE further agrees that (with the exception of paragraph 2 above), he shall not make 
-any disclosure of the SOFTWARE (including copies thereof or methods or concepts utilised therein) 
-to any person or entity, other than employees of the LICENSEE, to whom such disclosure is 
-necessary in order to use the SOFTWARE as provided herein. The LICENSEE shall appropriately 
-notify each employee to whom any such disclosure is made. Such disclosure must be made in 
-confidence and shall be kept in confidence by the employee in question.
-The LICENSEE agrees to use diligent and determined efforts to secure and protect the 
-SOFTWARE and copies thereof in a manner consistent with their proprietary character and the 
-maintenance of Licensor's rights therein, and without limitation thereof, to take appropriate action, 
-by instruction or agreement with its employees who are permitted access to the SOFTWARE or 
-copies thereof, or otherwise, to satisfy its obligations as hereby stated.
-
-6. TERMINATION:
-Stiftung SIC may terminate this Agreement without prior notice, if the licensee 1. neglects or fails to 
-perform or observe, or correct a breach of its obligations to Stiftung SIC; 2. goes out of business, 
-files a bankruptcy petition or has such a petition filed involuntarily against it or becomes insolvent; 3. 
-develops, sells, licenses or distributes or attempts to develop, sell, license or distribute any software 
-based on the SOFTWARE which is outside the scope of the limited rights granted herein, to any 
-third party. In the event of such a termination, the Licensee shall immediately destroy all copies and 
-ensure that all backup copies are destroyed as well.
-
-Stiftung SIC may at any time stop granting free licenses of the SOFTWARE in combination with the 
-MOA modules without prior notice. In this case, all licenses granted until that time remain valid, i.e. 
-allow the licensee to continue using the SOFTWARE in combination with the unmodified MOA 
-modules.
-
-7. LIABILITY:
-To the maximum extent allowed by applicable law Stiftung SIC shall not be liable for any damages 
-whatsoever (including, without limitation, damages for loss of business profits, business interruption, 
-loss of business information, or other pecuniary loss) arising out of the use of or inability to use the 
-SOFTWARE, even if Stiftung SIC has been advised of the possibility of such damages.
-
-8. WAIVER:
-Invalidity, on legal grounds, of any term of this Agreement does not render the Agreement as a whole 
-invalid.
-
-9. GOVERNING LAW, ARBITRATION:
-This Agreement is governed by Austrian law.
diff --git a/licenses/NOTICE.txt b/licenses/NOTICE.txt
deleted file mode 100644
index 1296eeb2c..000000000
--- a/licenses/NOTICE.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-MOA-ID/SP/SS
-Copyright 2008 Federal Chancellery Austria
-
-This product includes software originally developed at the
-Austrian Federal Computing Centre (BRZ - Bundesrechenzentrum,
-www.brz.gv.at) and the Federal Chancellery Austria (Stabsstelle
-IKT-Strategie des Bundes, Bundeskanzleramt, 
-www.digitales.oesterreich.gv.at).
-
-This product includes software developed by third parties
-and provided under an open source license (www.opensource.org).
-
-This product includes software "IAIK MOA" provided by
-Stiftung Secure Information and Communication Technologies SIC 
-(www.sic.st). This software has been licensed under the terms
-and conditions given in "IAIK-LICENSE".
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2e2d51c24..015eff21b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>MOA</groupId>
     <artifactId>MOA</artifactId>
     <packaging>pom</packaging>
-    <version>1.4.3-1</version>
+    <version>1.4.4</version>
     <name>MOA</name>
 
     <properties>
@@ -180,25 +180,25 @@
             <dependency>
                 <groupId>MOA</groupId>
                 <artifactId>moa-common</artifactId>
-                <version>1.4.3-1</version>
+                <version>1.4.4</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>
                 <groupId>MOA.id.server</groupId>
                 <artifactId>moa-id-lib</artifactId>
-                <version>1.4.3</version>
+                <version>1.4.4</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>
                 <groupId>MOA.spss.server</groupId>
                 <artifactId>moa-spss-lib</artifactId>
-                <version>1.4.3</version>
+                <version>1.4.4</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>
                 <groupId>MOA</groupId>
                 <artifactId>moa-common</artifactId>
-                <version>1.4.3-1</version>
+                <version>1.4.4</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
@@ -249,7 +249,7 @@
             <dependency>
                 <groupId>iaik.prod</groupId>
                 <artifactId>iaik_moa</artifactId>
-                <version>1.23</version>
+                <version>1.24</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>
@@ -267,7 +267,7 @@
             <dependency>
                 <groupId>iaik.prod</groupId>
                 <artifactId>iaik_ixsil</artifactId>
-                <version>1.2.2.3</version>
+                <version>1.2.2.4</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>
diff --git a/spss/assembly-lib.xml b/spss/assembly-lib.xml
index d955523d4..5fb27b0f2 100644
--- a/spss/assembly-lib.xml
+++ b/spss/assembly-lib.xml
@@ -140,8 +140,13 @@
 			<outputDirectory>/doc/clients</outputDirectory>
 		</fileSet>
 		<fileSet>
-			<directory>${basedir}/spss/server/serverlib/resources/licenses</directory>
-			<outputDirectory>/licenses</outputDirectory>
+			<directory>${basedir}</directory>
+			<outputDirectory>/</outputDirectory>
+			<includes>
+				<include>LICENSE-2.0.txt</include>
+				<include>NOTICE.txt</include>
+				<include>IAIK-LICENSE.txt</include>
+			</includes>
 		</fileSet>
 		<fileSet>
 			<directory>${basedir}/spss/server/tools/src/main/scripts</directory>
diff --git a/spss/assembly.xml b/spss/assembly.xml
index 62f59e26f..9c959ad06 100644
--- a/spss/assembly.xml
+++ b/spss/assembly.xml
@@ -118,8 +118,13 @@
 			<outputDirectory>/doc/clients</outputDirectory>
 		</fileSet>
 		<fileSet>
-			<directory>${basedir}/spss/server/serverlib/resources/licenses</directory>
-			<outputDirectory>/licenses</outputDirectory>
+			<directory>${basedir}</directory>
+			<outputDirectory>/</outputDirectory>
+			<includes>
+				<include>LICENSE-2.0.txt</include>
+				<include>NOTICE.txt</include>
+				<include>IAIK-LICENSE.txt</include>
+			</includes>
 		</fileSet>
 		<fileSet>
 			<directory>${basedir}/spss/server/serverws/data/deploy/tomcat</directory>
diff --git a/spss/handbook/handbook/config/config.html b/spss/handbook/handbook/config/config.html
index 1d5442865..a8d1eb0a9 100644
--- a/spss/handbook/handbook/config/config.html
+++ b/spss/handbook/handbook/config/config.html
@@ -15,7 +15,7 @@
     </tr>
   </table>
   <hr/> 
-  <p class="title"><a href="../index.html">MOA: Serversignatur (SS) und Signaturpr&uuml;fung (SP), V 1.4.3</a></p> 
+  <p class="title"><a href="../index.html">MOA: Serversignatur (SS) und Signaturpr&uuml;fung (SP), V 1.4.4</a></p> 
   <p class="subtitle">Konfiguration</p> 
   <hr/>
   <h1>Inhalt</h1>
diff --git a/spss/handbook/handbook/faq/faq.html b/spss/handbook/handbook/faq/faq.html
index 36484a2d0..ef389ce03 100644
--- a/spss/handbook/handbook/faq/faq.html
+++ b/spss/handbook/handbook/faq/faq.html
@@ -15,7 +15,7 @@
     </tr>
   </table>
   <hr/> 
-  <p class="title"><a href="../index.html">MOA: Serversignatur (SS) und Signaturpr&uuml;fung (SP), V 1.4.3</a></p>
+  <p class="title"><a href="../index.html">MOA: Serversignatur (SS) und Signaturpr&uuml;fung (SP), V 1.4.4</a></p>
   <p class="subtitle">FAQ</p> 
   <hr/>
   <h1>Inhalt</h1>
diff --git a/spss/handbook/handbook/index.html b/spss/handbook/handbook/index.html
index 11db2c816..37b4c9db9 100644
--- a/spss/handbook/handbook/index.html
+++ b/spss/handbook/handbook/index.html
@@ -16,7 +16,7 @@
   </table>
   <hr/> 
   <p class="title">MOA: Serversignatur (SS) und Signaturpr&uuml;fung (SP) </p> 
-  <p class="subtitle">&Uuml;bersicht zur Dokumentation der Version 1.4.3 </p> 
+  <p class="subtitle">&Uuml;bersicht zur Dokumentation der Version 1.4.4 </p> 
   <hr/>
   <dl>
     <dt><a href="./intro/intro.html">Einf&uuml;hrung</a></dt>
diff --git a/spss/handbook/handbook/install/install.html b/spss/handbook/handbook/install/install.html
index 60589f733..d7f1e7a0b 100644
--- a/spss/handbook/handbook/install/install.html
+++ b/spss/handbook/handbook/install/install.html
@@ -15,7 +15,7 @@
     </tr>
   </table>
   <hr/> 
-  <p class="title"><a href="../index.html">MOA: Serversignatur (SS) und Signaturpr&uuml;fung (SP), V 1.4.3</a></p> 
+  <p class="title"><a href="../index.html">MOA: Serversignatur (SS) und Signaturpr&uuml;fung (SP), V 1.4.4</a></p> 
   <p class="subtitle">Installation</p> 
   <hr/>
   <h1>Inhalt</h1>
@@ -127,7 +127,7 @@
   <dt>Installation von Apache Tomcat 4.1</dt>
   <dd> Installieren Sie <a href="#referenziertesoftware">Apache Tomcat 4.1.18</a> oder h&ouml;her in ein Verzeichnis, das keine Leerzeichen im Pfadnamen enth&auml;lt. Wir empfehlen die Installation von <a href="#referenziertesoftware">Apache Tomcat 4.1.31</a>. Verwenden Sie bitte die zu Ihrem J2SE SDK passende Distribution von Tomcat. Das Wurzelverzeichnis der Tomcat-Installation wird im weiteren Verlauf als <code>$CATALINA_HOME</code> bezeichnet.</dd>
   <dt>Entpacken der MOA SP/SS Webservice Distribution</dt>
-  <dd> Entpacken Sie die Datei <code>moa-spss-1.4.3.zip</code> in ein beliebiges Verzeichnis. Dieses Verzeichnis wird im weiteren Verlauf als <code>$MOA_SPSS_INST</code> bezeichnet. </dd>
+  <dd> Entpacken Sie die Datei <code>moa-spss-1.4.4.zip</code> in ein beliebiges Verzeichnis. Dieses Verzeichnis wird im weiteren Verlauf als <code>$MOA_SPSS_INST</code> bezeichnet. </dd>
   <dt>Installation der  Krypographiebibliotheken von SIC/IAIK</dt>
   <dd>
     <p>Die Installation der  Kryptographiebibliotheken von <a href="http://jce.iaik.tugraz.at/" target="_blank">SIC/IAIK</a>:</p>
@@ -380,7 +380,7 @@ INFO | 01 21:25:26,540 | Thread-3 | TID=1049225059594-100 NID=&lt;null&gt;
     <dt>Installation von J2SE SDK</dt>
     <dd>Installieren Sie<a href="#referenziertesoftware"> J2SE 1.4.x SDK</a> oder <a href="#referenziertesoftware">J2SE 5.0 SDK</a> in ein beliebiges Verzeichnis. Wir empfehlen die Installation von <a href="#referenziertesoftware">J2SE 5.0 SDK</a>. Das Wurzelverzeichnis der J2SE SDK Installation wird im weiteren Verlauf als <code>$JAVA_HOME</code> bezeichnet. </dd>
     <dt>Entpacken der MOA SP/SS Klassenbibliotheks-Distribution</dt>
-    <dd> Entpacken Sie die Datei <code>moa-spss-1.4.3-lib.zip</code> in ein beliebiges Verzeichnis. Dieses Verzeichnis wird im weiteren Verlauf als <code>$MOA_SPSS_INST</code> bezeichnet. </dd>
+    <dd> Entpacken Sie die Datei <code>moa-spss-1.4.4-lib.zip</code> in ein beliebiges Verzeichnis. Dieses Verzeichnis wird im weiteren Verlauf als <code>$MOA_SPSS_INST</code> bezeichnet. </dd>
     <dt>Installation der Krypographiebibliotheken von SIC/IAIK</dt>
     <dd>
       <p>Die Installation der  Kryptographiebibliotheken von <a href="http://jce.iaik.tugraz.at/" target="_blank">SIC/IAIK</a>:</p>
@@ -399,7 +399,7 @@ INFO | 01 21:25:26,540 | Thread-3 | TID=1049225059594-100 NID=&lt;null&gt;
 
 </tr><tr>
 <td>MOA SP/SS</td>
-<td>1.4.3&nbsp; </td>
+<td>1.4.4&nbsp; </td>
 <td><code>moa-spss.jar</code>, <code>moa-common.jar</code></td>
 </tr><tr>
 <td>MOA IAIK</td>
diff --git a/spss/handbook/handbook/intro/intro.html b/spss/handbook/handbook/intro/intro.html
index bc887e958..8a9fb1bd1 100644
--- a/spss/handbook/handbook/intro/intro.html
+++ b/spss/handbook/handbook/intro/intro.html
@@ -15,7 +15,7 @@
     </tr>
   </table>
   <hr/> 
-  <p class="title"><a href="../index.html">MOA: Serversignatur (SS) und Signaturpr&uuml;fung (SP), V 1.4.3</a></p> 
+  <p class="title"><a href="../index.html">MOA: Serversignatur (SS) und Signaturpr&uuml;fung (SP), V 1.4.4</a></p> 
   <p class="subtitle">Einf&uuml;hrung</p> 
   <hr/>
   <h1>Inhalt</h1>
@@ -31,7 +31,7 @@
 <hr/>
   <h1><a name="allgemeines"></a>1 Allgemeines</h1>
   <p> Die Module Serversignatur (SS) und Signaturpr&uuml;fung (SP) k&ouml;nnen von Anwendungen verwendet werden, um elektronische Signaturen zu erstellen bzw. vorliegende elektronische Signaturen zu &uuml;berpr&uuml;fen.</p>
-  <p>    Die Funktionalit&auml;t und der Aufbau der Schnittstelle zu den beiden Modulen ist in der <a href="../spec/MOA-SPSS-1.2.pdf" target="_blank" class="term">Spezifikation MOA SP/SS (V1.2)</a> detailliert beschrieben. Da diese Spezifikation auf der <a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20020831/core/Core.html" target="_blank" class="term"> Schnittstellenspezifikation des Security-Layers (V 1.1)</a> aufbaut, ist deren Kenntnis zum Verstehen der Schnittstellen zu SS und SP erforderlich. </p>
+  <p>    Die Funktionalit&auml;t und der Aufbau der Schnittstelle zu den beiden Modulen ist in der <a href="../spec/MOA-SPSS-1.3.pdf" target="_blank" class="term">Spezifikation MOA SP/SS (V1.3)</a> detailliert beschrieben. Da diese Spezifikation auf der <a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20020831/core/Core.html" target="_blank" class="term"> Schnittstellenspezifikation des Security-Layers (V 1.1)</a> aufbaut, ist deren Kenntnis zum Verstehen der Schnittstellen zu SS und SP erforderlich. </p>
   <h1><a name="ss"></a>2 Modul Serversignatur (SS) </h1>
   <p> Das Modul Serversignatur (SS) dient zum Erstellen von XML-Signaturen in Anlehnung an die <a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20020831/core/Core.html"> </a><a href="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20020831/core/Core.html" target="_blank" class="term">Schnittstellenspezifikation des Security-Layers (V 1.1)</a>. Eine Signatur kann entweder rein in Software erstellt werden, oder aber unter Zuhilfenahme eines Hardware Security Modules (HSM), das den privaten Schl&uuml;ssel gesch&uuml;tzt enth&auml;lt und die Signatur berechnet.</p>
   <p>    Der Zugriff auf einzelne Signaturschl&uuml;ssel in MOA SS kann basierend auf dem f&uuml;r TLS-Client-Authentisierung verwendeten Zertifikat eingeschr&auml;nkt werden. </p>
diff --git a/spss/handbook/handbook/usage/usage.html b/spss/handbook/handbook/usage/usage.html
index 95d3e49a0..deecfe7ff 100644
--- a/spss/handbook/handbook/usage/usage.html
+++ b/spss/handbook/handbook/usage/usage.html
@@ -15,7 +15,7 @@
     </tr>
   </table>
   <hr/>
-  <p class="title"><a href="../index.html">MOA: Serversignatur (SS) und Signaturpr&uuml;fung (SP), V 1.4.3</a></p>
+  <p class="title"><a href="../index.html">MOA: Serversignatur (SS) und Signaturpr&uuml;fung (SP), V 1.4.4</a></p>
   <p class="subtitle">Anwendung</p>
   <hr/>
   <h1>Inhalt</h1>
diff --git a/spss/pom.xml b/spss/pom.xml
index 4ce7b7280..a102fd8a1 100644
--- a/spss/pom.xml
+++ b/spss/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>MOA</groupId>
         <artifactId>MOA</artifactId>
-        <version>1.4.3-1</version>
+        <version>1.4.4</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/spss/server/history.txt b/spss/server/history.txt
index c7183ac67..941713559 100644
--- a/spss/server/history.txt
+++ b/spss/server/history.txt
@@ -1,3 +1,11 @@
+##############
+1.4.4
+##############
+
+- IAIK Libraries aktualisiert:
+	iaik-moa:           Version 1.24
+	iaik-ixsil:			Version 1.2.2.4
+
 ##############
 1.4.3-1
 ##############
diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index 5b224eef6..972822a73 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -9,7 +9,7 @@
 	<groupId>MOA.spss.server</groupId>
 	<artifactId>moa-spss-lib</artifactId>
 	<packaging>jar</packaging>
-	<version>1.4.3</version>
+	<version>1.4.4</version>
 	<name>MOA SP/SS API</name>
 
 	<properties>
diff --git a/spss/server/serverlib/resources/licenses/Apache-2.0.txt b/spss/server/serverlib/resources/licenses/Apache-2.0.txt
deleted file mode 100644
index 57bc88a15..000000000
--- a/spss/server/serverlib/resources/licenses/Apache-2.0.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/spss/server/serverlib/resources/licenses/IAIK-License.txt b/spss/server/serverlib/resources/licenses/IAIK-License.txt
deleted file mode 100644
index c0db63b22..000000000
--- a/spss/server/serverlib/resources/licenses/IAIK-License.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-IAIK MOA Runtime Lizenz
-
-Stiftung SIC gewährt dem Lizenznehmer eine nicht-exklusive, nicht-übertragbare 
-Runtime Lizenz für die "IAIK MOA" Module im Kontext von MOA SP/SS und MOA ID. 
-Alle Versuche, Teile oder die kompletten  IAIK Crypto Toolkits, die zusammen 
-mit dem MOA Produktbündel ausgeliefert werden, für andere Zwecke als jenem 
-für Applikationen im MOA Kontext zu verwenden, sind nicht erlaubt. Auch weitere 
-Versuche, die sich auf die Entwicklung von Anwendungen , oder aber darüber hinaus
-auf die Schaffung eines eigenen Toolkits, oder die Aufnahme in ein weiters
-weiteres Toolkit beziehen, sind nicht erlaubt.
-Die hier beschriebene Runtime Lizenz ist nicht übertragbar auf weitere 
-Vertragspartner des Kunden, Personen, Organisationen oder Unternehmen 
-außerhalb der Organisation des Lizenznehmers.
diff --git a/spss/server/serverlib/resources/licenses/Jaxen.txt b/spss/server/serverlib/resources/licenses/Jaxen.txt
deleted file mode 100644
index bef65a520..000000000
--- a/spss/server/serverlib/resources/licenses/Jaxen.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-Copyright 2003 (C) The Werken Company. All Rights Reserved.
- 
- Redistribution and use of this software and associated documentation
- ("Software"), with or without modification, are permitted provided
- that the following conditions are met:
-
- 1. Redistributions of source code must retain copyright
-    statements and notices.  Redistributions must also contain a
-    copy of this document.
- 
- 2. 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.
- 
- 3. The name "jaxen" must not be used to endorse or promote
-    products derived from this Software without prior written
-    permission of The Werken Company.  For written permission,
-    please contact bob@werken.com.
- 
- 4. Products derived from this Software may not be called "jaxen"
-    nor may "jaxen" appear in their names without prior written
-    permission of The Werken Company. "jaxen" is a registered
-    trademark of The Werken Company.
- 
- 5. Due credit should be given to The Werken Company.
-    (http://jaxen.werken.com/).
- 
- THIS SOFTWARE IS PROVIDED BY THE WERKEN COMPANY AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESSED 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 WERKEN COMPANY OR ITS 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.
\ No newline at end of file
diff --git a/spss/server/serverlib/resources/licenses/PostgreSQL-JDBC.txt b/spss/server/serverlib/resources/licenses/PostgreSQL-JDBC.txt
deleted file mode 100644
index 30d54d778..000000000
--- a/spss/server/serverlib/resources/licenses/PostgreSQL-JDBC.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Copyright (c) 1997-2005, PostgreSQL Global Development Group
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-2. 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.
-3. Neither the name of the PostgreSQL Global Development Group 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.
\ No newline at end of file
diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml
index b2736b56f..7dac91d35 100644
--- a/spss/server/serverws/pom.xml
+++ b/spss/server/serverws/pom.xml
@@ -10,7 +10,7 @@
     <groupId>MOA.spss.server</groupId>
     <artifactId>moa-spss-ws</artifactId>
     <packaging>war</packaging>
-    <version>1.4.3</version>
+    <version>1.4.4</version>
     <name>MOA SP/SS WebService</name>
 
     <properties>
-- 
cgit v1.2.3