Revert "update version management"

This reverts commit e147bdb7da8e48c1483c7732a0eb6b6f54699b66.

Conflicts:
	id/ConfigWebTool/pom.xml

279 files changed, 48 insertions, 5158 deletions

diff --git a/.classpath b/.classpath
deleted file mode 100644
index 1e9054b32..000000000
--- a/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index ea8c4bf7f..000000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/.project b/.project
deleted file mode 100644
index df00408af..000000000
--- a/.project
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>MOA</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-	</natures>
-</projectDescription>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c020..000000000
--- a/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 046ca3fd3..000000000
--- a/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Thu Jan 03 11:06:02 CET 2013
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/.settings/org.maven.ide.eclipse.prefs b/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index caff2563b..000000000
--- a/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Tue Jul 07 16:06:45 CEST 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/common/.classpath b/common/.classpath
deleted file mode 100644
index c2e154781..000000000
--- a/common/.classpath
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/common/.gitignore b/common/.gitignore
deleted file mode 100644
index ea8c4bf7f..000000000
--- a/common/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/common/.project b/common/.project
deleted file mode 100644
index 38406751b..000000000
--- a/common/.project
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>moa-common</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-	</natures>
-</projectDescription>
diff --git a/common/.settings/org.eclipse.core.resources.prefs b/common/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 839d647ee..000000000
--- a/common/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding/<project>=UTF-8
diff --git a/common/.settings/org.eclipse.jdt.core.prefs b/common/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 69c31cd49..000000000
--- a/common/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/common/.settings/org.eclipse.m2e.core.prefs b/common/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/common/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/common/.settings/org.eclipse.wst.common.component b/common/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 66fea0f1d..000000000
--- a/common/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-  <wb-module deploy-name="moa-common">
-    <wb-resource deploy-path="/" source-path="src/main/java"/>
-    <wb-resource deploy-path="/" source-path="src/main/resources"/>
-        <wb-resource deploy-path="/" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/" source-path="/src/main/resources"/>
-  </wb-module>
-</project-modules>
diff --git a/common/.settings/org.eclipse.wst.common.project.facet.core.xml b/common/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 0c619da6d..000000000
--- a/common/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="jst.java"/>
-  <fixed facet="jst.utility"/>
-  <installed facet="jst.utility" version="1.0"/>
-  <installed facet="jst.java" version="1.6"/>
-</faceted-project>
diff --git a/common/.settings/org.eclipse.wst.validation.prefs b/common/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 04cad8cb7..000000000
--- a/common/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
diff --git a/common/.settings/org.maven.ide.eclipse.prefs b/common/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index fa32b3074..000000000
--- a/common/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Tue Jul 07 16:06:47 CEST 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/common/pom.xml b/common/pom.xml
index b2f7f652c..cde0c6ed8 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -103,7 +103,7 @@
 
     <build>
         <plugins>
-<!--                 		<plugin>
+                		<plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -120,7 +120,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin> -->
+        		</plugin>
         
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/id/.project b/id/.project
deleted file mode 100644
index 8ed852cdb..000000000
--- a/id/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>id</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/id/.settings/org.eclipse.core.resources.prefs b/id/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c020..000000000
--- a/id/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/id/.settings/org.eclipse.jdt.core.prefs b/id/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 425d60f0d..000000000
--- a/id/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Tue Jul 07 16:07:14 CEST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.source=1.4
diff --git a/id/.settings/org.eclipse.m2e.core.prefs b/id/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/id/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/id/.settings/org.maven.ide.eclipse.prefs b/id/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index f2132d05c..000000000
--- a/id/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Tue Jul 07 16:06:55 CEST 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/id/ConfigWebTool/.classpath b/id/ConfigWebTool/.classpath
deleted file mode 100644
index 8a0fc7b4e..000000000
--- a/id/ConfigWebTool/.classpath
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/id/ConfigWebTool/.codepro/deadCodeEntryPoints.xml b/id/ConfigWebTool/.codepro/deadCodeEntryPoints.xml
deleted file mode 100644
index 814d580d8..000000000
--- a/id/ConfigWebTool/.codepro/deadCodeEntryPoints.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated by Code Pro -->
-<entry-points
-		version="1">
-	<explicit-entry-points/>
-	<include-main
-			enabled="true"/>
-	<include-tests
-			enabled="false"/>
-	<include-xml
-			enabled="true"/>
-</entry-points>
\ No newline at end of file
diff --git a/id/ConfigWebTool/.gitignore b/id/ConfigWebTool/.gitignore
deleted file mode 100644
index ea8c4bf7f..000000000
--- a/id/ConfigWebTool/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/id/ConfigWebTool/.project b/id/ConfigWebTool/.project
deleted file mode 100644
index fa6341ffb..000000000
--- a/id/ConfigWebTool/.project
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>ConfigurationInterface</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
-	</natures>
-</projectDescription>
diff --git a/id/ConfigWebTool/.settings/.jsdtscope b/id/ConfigWebTool/.settings/.jsdtscope
deleted file mode 100644
index b46b9207a..000000000
--- a/id/ConfigWebTool/.settings/.jsdtscope
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/webapp"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
-		<attributes>
-			<attribute name="hide" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
-	<classpathentry kind="output" path=""/>
-</classpath>
diff --git a/id/ConfigWebTool/.settings/com.wdev91.eclipse.copyright.xml b/id/ConfigWebTool/.settings/com.wdev91.eclipse.copyright.xml
deleted file mode 100644
index 2d8100491..000000000
--- a/id/ConfigWebTool/.settings/com.wdev91.eclipse.copyright.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<project>
-	<owner>Thomas Lenz</owner>
-	<copyright><![CDATA[Copyright 2003 Federal Chancellery Austria
-MOA-ID has been developed in a cooperation between BRZ, the Federal
-Chancellery Austria - ICT staff unit, and Graz University of Technology.
-
-Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
-the European Commission - subsequent versions of the EUPL (the "Licence");
-You may not use this work except in compliance with the Licence.
-You may obtain a copy of the Licence at:
-http://www.osor.eu/eupl/
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the Licence is distributed on an "AS IS" basis,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the Licence for the specific language governing permissions and
-limitations under the Licence.
-
-This product combines work with different licenses. See the "NOTICE" text
-file for details on the various modules and licenses.
-The "NOTICE" text file is part of the distribution. Any derivative works
-that you distribute must include a readable copy of the "NOTICE" text file.]]></copyright>
-	<header contentId="org.eclipse.pde.fragmentManifest" excluded="true" />
-	<header contentId="org.eclipse.pde.pluginProperties" excluded="true" />
-	<header contentId="org.eclipse.pde.productFile" excluded="true" />
-	<header contentId="org.eclipse.jst.j2ee.appclientDD" excluded="true" />
-	<header contentId="org.eclipse.ant.core.antBuildFile" excluded="true" />
-	<header contentId="org.eclipse.pde.simpleCheatSheet" excluded="true" />
-	<header contentId="org.eclipse.core.runtime.xml" postBlankLines="0" lineFormat="false" preserveFirstLine="true">
-		<beginLine><![CDATA[<!--]]></beginLine>
-		<linePrefix><![CDATA[  ]]></linePrefix>
-		<endLine><![CDATA[-->]]></endLine>
-		<firstLinePattern><![CDATA[<\?xml version=.*\?>]]></firstLinePattern>
-	</header>
-	<header contentId="org.eclipse.jst.j2ee.webDD" excluded="true" />
-	<header contentId="org.eclipse.pde.compositeCheatSheet" excluded="true" />
-	<header contentId="org.eclipse.pde.schema" excluded="true" />
-	<header contentId="org.eclipse.jst.j2ee.earDD" excluded="true" />
-	<header contentId="org.eclipse.pde.tocFile" excluded="true" />
-	<header contentId="org.eclipse.pde.ctxHelpFile" excluded="true" />
-	<header contentId="org.eclipse.pde.categoryManifest" excluded="true" />
-	<header contentId="org.eclipse.jdt.core.JARManifest" excluded="true" />
-	<header contentId="org.eclipse.pde.buildProperties" excluded="true" />
-	<header contentId="org.eclipse.ui.views.log.log" excluded="true" />
-	<header contentId="org.eclipse.pde.siteManifest" excluded="true" />
-	<header contentId="org.eclipse.pde.bundleManifest" excluded="true" />
-	<header contentId="org.eclipse.pde.targetFile" excluded="true" />
-	<header contentId="org.eclipse.jst.j2ee.connectorDD" excluded="true" />
-	<header contentId="org.eclipse.pde.pluginManifest" excluded="true" />
-	<header contentId="org.eclipse.core.runtime.text" postBlankLines="0" lineFormat="true" preserveFirstLine="false">
-		<beginLine><![CDATA[#-------------------------------------------------------------------------------]]></beginLine>
-		<linePrefix><![CDATA[# ]]></linePrefix>
-		<endLine><![CDATA[#-------------------------------------------------------------------------------]]></endLine>
-	</header>
-	<header contentId="org.eclipse.jst.j2ee.ejbDD" excluded="true" />
-	<header contentId="org.eclipse.pde.featureManifest" excluded="true" />
-	<header contentId="org.eclipse.jdt.core.javaSource" postBlankLines="0" lineFormat="false" preserveFirstLine="false">
-		<beginLine><![CDATA[/*******************************************************************************]]></beginLine>
-		<linePrefix><![CDATA[ * ]]></linePrefix>
-		<endLine><![CDATA[ ******************************************************************************/]]></endLine>
-	</header>
-</project>
diff --git a/id/ConfigWebTool/.settings/org.eclipse.core.resources.prefs b/id/ConfigWebTool/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 29abf9995..000000000
--- a/id/ConfigWebTool/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/id/ConfigWebTool/.settings/org.eclipse.jdt.core.prefs b/id/ConfigWebTool/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 60105c1b9..000000000
--- a/id/ConfigWebTool/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/id/ConfigWebTool/.settings/org.eclipse.m2e.core.prefs b/id/ConfigWebTool/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/id/ConfigWebTool/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/id/ConfigWebTool/.settings/org.eclipse.wst.common.component b/id/ConfigWebTool/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index fadfb1189..000000000
--- a/id/ConfigWebTool/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="ConfigurationInterface">
-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
-        <dependent-module archiveName="moa-id-commons-2.1.0-RC1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-commons/moa-id-commons">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="moa-common-2.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="moa-id-lib-2.1.0-RC1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <property name="context-root" value="ConfigurationInterface"/>
-        <property name="java-output-path" value="/ConfigurationInterface/target/classes"/>
-    </wb-module>
-</project-modules>
diff --git a/id/ConfigWebTool/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/ConfigWebTool/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index ef2778943..000000000
--- a/id/ConfigWebTool/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="wst.jsdt.web"/>
-  <installed facet="java" version="1.5"/>
-  <installed facet="jst.web" version="2.5"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
-</faceted-project>
diff --git a/id/ConfigWebTool/.settings/org.eclipse.wst.jsdt.ui.superType.container b/id/ConfigWebTool/.settings/org.eclipse.wst.jsdt.ui.superType.container
deleted file mode 100644
index 3bd5d0a48..000000000
--- a/id/ConfigWebTool/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/id/ConfigWebTool/.settings/org.eclipse.wst.jsdt.ui.superType.name b/id/ConfigWebTool/.settings/org.eclipse.wst.jsdt.ui.superType.name
deleted file mode 100644
index 05bd71b6e..000000000
--- a/id/ConfigWebTool/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ /dev/null
@@ -1 +0,0 @@
-Window
\ No newline at end of file
diff --git a/id/ConfigWebTool/.settings/org.eclipse.wst.validation.prefs b/id/ConfigWebTool/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 04cad8cb7..000000000
--- a/id/ConfigWebTool/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml
index 01359e38a..e777a52ac 100644
--- a/id/ConfigWebTool/pom.xml
+++ b/id/ConfigWebTool/pom.xml
@@ -143,7 +143,7 @@
 		<build>
 			<plugins>
 			
-<!-- 			       	<plugin>
+			       	<plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -160,7 +160,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin> -->
+        		</plugin>
         		
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/id/ConfigWebTool/src/main/webapp/images/Thumbs.db b/id/ConfigWebTool/src/main/webapp/images/Thumbs.db
deleted file mode 100644
index d396c36dd..000000000
--- a/id/ConfigWebTool/src/main/webapp/images/Thumbs.db
+++ /dev/null
diff --git a/id/oa/.classpath b/id/oa/.classpath
deleted file mode 100644
index 6a6c8e335..000000000
--- a/id/oa/.classpath
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/id/oa/.codepro/deadCodeEntryPoints.xml b/id/oa/.codepro/deadCodeEntryPoints.xml
deleted file mode 100644
index 814d580d8..000000000
--- a/id/oa/.codepro/deadCodeEntryPoints.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated by Code Pro -->
-<entry-points
-		version="1">
-	<explicit-entry-points/>
-	<include-main
-			enabled="true"/>
-	<include-tests
-			enabled="false"/>
-	<include-xml
-			enabled="true"/>
-</entry-points>
\ No newline at end of file
diff --git a/id/oa/.gitignore b/id/oa/.gitignore
deleted file mode 100644
index ea8c4bf7f..000000000
--- a/id/oa/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/id/oa/.project b/id/oa/.project
deleted file mode 100644
index bc5551a61..000000000
--- a/id/oa/.project
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>moa-id-oa</name>
-	<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-	</natures>
-</projectDescription>
diff --git a/id/oa/.settings/.jsdtscope b/id/oa/.settings/.jsdtscope
deleted file mode 100644
index 3b2886eab..000000000
--- a/id/oa/.settings/.jsdtscope
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="target/m2e-wtp/web-resources"/>
-	<classpathentry kind="src" path="src/main/webapp"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
-		<attributes>
-			<attribute name="hide" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
-	<classpathentry kind="output" path=""/>
-</classpath>
diff --git a/id/oa/.settings/org.eclipse.core.resources.prefs b/id/oa/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index abdea9ac0..000000000
--- a/id/oa/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/id/oa/.settings/org.eclipse.jdt.core.prefs b/id/oa/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 69c31cd49..000000000
--- a/id/oa/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/id/oa/.settings/org.eclipse.m2e.core.prefs b/id/oa/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/id/oa/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/id/oa/.settings/org.eclipse.wst.common.component b/id/oa/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 7fdcd5907..000000000
--- a/id/oa/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-  <wb-module deploy-name="moa-id-oa">
-        <dependent-module archiveName="moa-common-2.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-    <property name="context-root" value="moa-id-oa"/>
-    <wb-resource deploy-path="/" source-path="src/main/webapp"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-    <property name="java-output-path" value="/target/classes"/>
-  </wb-module>
-</project-modules>
diff --git a/id/oa/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/oa/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 2a6ae7e75..000000000
--- a/id/oa/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="jst.java"/>
-  <fixed facet="jst.web"/>
-  <installed facet="jst.web" version="2.4"/>
-  <installed facet="jst.java" version="1.4"/>
-</faceted-project>
\ No newline at end of file
diff --git a/id/oa/.settings/org.eclipse.wst.jsdt.ui.superType.container b/id/oa/.settings/org.eclipse.wst.jsdt.ui.superType.container
deleted file mode 100644
index 3bd5d0a48..000000000
--- a/id/oa/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/id/oa/.settings/org.eclipse.wst.jsdt.ui.superType.name b/id/oa/.settings/org.eclipse.wst.jsdt.ui.superType.name
deleted file mode 100644
index 05bd71b6e..000000000
--- a/id/oa/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ /dev/null
@@ -1 +0,0 @@
-Window
\ No newline at end of file
diff --git a/id/oa/.settings/org.eclipse.wst.validation.prefs b/id/oa/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 04cad8cb7..000000000
--- a/id/oa/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
diff --git a/id/oa/.settings/org.maven.ide.eclipse.prefs b/id/oa/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 5fed4cf5a..000000000
--- a/id/oa/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/id/oa/pom.xml b/id/oa/pom.xml
index d5b3de522..7965d2157 100644
--- a/id/oa/pom.xml
+++ b/id/oa/pom.xml
@@ -34,7 +34,7 @@
     <build>
         <finalName>oa</finalName>
         <plugins>
-<!--         		  <plugin>
+        		  <plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -51,7 +51,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin> -->
+        		</plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/id/pom.xml b/id/pom.xml
index 0753a7805..78ee829ba 100644
--- a/id/pom.xml
+++ b/id/pom.xml
@@ -25,7 +25,7 @@
 
     <build>
         <plugins>
-<!-- 			       	<plugin>
+			       	<plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -42,7 +42,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin> -->
+        		</plugin>
             <plugin>
                 <artifactId>maven-enforcer-plugin</artifactId>
                 <version>1.1.1</version>
diff --git a/id/server/.project b/id/server/.project
deleted file mode 100644
index ada8ac1d1..000000000
--- a/id/server/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>moa-id</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/id/server/.settings/org.eclipse.core.resources.prefs b/id/server/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c020..000000000
--- a/id/server/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/id/server/.settings/org.eclipse.m2e.core.prefs b/id/server/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/id/server/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/id/server/auth/.classpath b/id/server/auth/.classpath
deleted file mode 100644
index b645d7579..000000000
--- a/id/server/auth/.classpath
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/id/server/auth/.codepro/deadCodeEntryPoints.xml b/id/server/auth/.codepro/deadCodeEntryPoints.xml
deleted file mode 100644
index 814d580d8..000000000
--- a/id/server/auth/.codepro/deadCodeEntryPoints.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated by Code Pro -->
-<entry-points
-		version="1">
-	<explicit-entry-points/>
-	<include-main
-			enabled="true"/>
-	<include-tests
-			enabled="false"/>
-	<include-xml
-			enabled="true"/>
-</entry-points>
\ No newline at end of file
diff --git a/id/server/auth/.gitignore b/id/server/auth/.gitignore
deleted file mode 100644
index 0b1e2434c..000000000
--- a/id/server/auth/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/target
-/bin
-/target
diff --git a/id/server/auth/.project b/id/server/auth/.project
deleted file mode 100644
index a90b7bf5f..000000000
--- a/id/server/auth/.project
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>moa-id-auth</name>
-	<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-	<projects>
-		<project>moa-spss-lib</project>
-		<project>moa-common</project>
-		<project>stork-saml-engine</project>
-		<project>moa-id-commons</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-	</natures>
-</projectDescription>
diff --git a/id/server/auth/.settings/.jsdtscope b/id/server/auth/.settings/.jsdtscope
deleted file mode 100644
index 3b2886eab..000000000
--- a/id/server/auth/.settings/.jsdtscope
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="target/m2e-wtp/web-resources"/>
-	<classpathentry kind="src" path="src/main/webapp"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
-		<attributes>
-			<attribute name="hide" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
-	<classpathentry kind="output" path=""/>
-</classpath>
diff --git a/id/server/auth/.settings/org.eclipse.core.resources.prefs b/id/server/auth/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 839d647ee..000000000
--- a/id/server/auth/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding/<project>=UTF-8
diff --git a/id/server/auth/.settings/org.eclipse.jdt.core.prefs b/id/server/auth/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 69c31cd49..000000000
--- a/id/server/auth/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/id/server/auth/.settings/org.eclipse.m2e.core.prefs b/id/server/auth/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/id/server/auth/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/id/server/auth/.settings/org.eclipse.wst.common.component b/id/server/auth/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 9216b6340..000000000
--- a/id/server/auth/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-  <wb-module deploy-name="moa-id-auth">
-        <dependent-module archiveName="moa-spss-lib-2.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="moa-common-2.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="moa-id-lib-2.1.0-RC1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="moa-id-commons-2.1.0-RC1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-commons/moa-id-commons">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="SamlEngine-1.4.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/SamlEngine/SamlEngine">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="Commons-1.4.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/Commons/Commons">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-    <property name="context-root" value="moa-id-auth"/>
-    <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-    <property name="java-output-path" value="/target/classes"/>
-  </wb-module>
-</project-modules>
diff --git a/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 463771365..000000000
--- a/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="jst.java"/>
-  <fixed facet="jst.web"/>
-  <installed facet="jst.web" version="2.3"/>
-  <installed facet="jst.java" version="1.6"/>
-</faceted-project>
diff --git a/id/server/auth/.settings/org.eclipse.wst.jsdt.ui.superType.container b/id/server/auth/.settings/org.eclipse.wst.jsdt.ui.superType.container
deleted file mode 100644
index 3bd5d0a48..000000000
--- a/id/server/auth/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/id/server/auth/.settings/org.eclipse.wst.jsdt.ui.superType.name b/id/server/auth/.settings/org.eclipse.wst.jsdt.ui.superType.name
deleted file mode 100644
index 05bd71b6e..000000000
--- a/id/server/auth/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ /dev/null
@@ -1 +0,0 @@
-Window
\ No newline at end of file
diff --git a/id/server/auth/.settings/org.eclipse.wst.validation.prefs b/id/server/auth/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 04cad8cb7..000000000
--- a/id/server/auth/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
diff --git a/id/server/auth/.settings/org.maven.ide.eclipse.prefs b/id/server/auth/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 5fed4cf5a..000000000
--- a/id/server/auth/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/id/server/idserverlib/.classpath b/id/server/idserverlib/.classpath
deleted file mode 100644
index 20ec727db..000000000
--- a/id/server/idserverlib/.classpath
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="D:/Projekte/svn/moa-id/opensaml-2.6.0-sources.jar"/>
-	<classpathentry kind="lib" path="D:/Projekte/svn/moa-id/xmltooling-1.4.0-sources.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/id/server/idserverlib/.codepro/deadCodeEntryPoints.xml b/id/server/idserverlib/.codepro/deadCodeEntryPoints.xml
deleted file mode 100644
index d1a0b79e7..000000000
--- a/id/server/idserverlib/.codepro/deadCodeEntryPoints.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated by Code Pro -->
-<entry-points version="1">
-	<explicit-entry-points>
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java%at.gv.egovernment.moa.id.entrypoints" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#java.io.IOException" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#java.util.ConcurrentModificationException" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#java.util.HashMap" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#java.util.Iterator" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#java.util.List" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#java.util.Map" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#java.util.Set" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#java.util.concurrent.ConcurrentHashMap" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#javax.servlet.ServletConfig" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#javax.servlet.ServletException" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#javax.servlet.http.HttpServletRequest" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#javax.servlet.http.HttpServletResponse" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#javax.servlet.http.HttpSession" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#javax.swing.ListModel" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#at.gv.egovernment.moa.id.AuthenticationException" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#at.gv.egovernment.moa.id.MOAIDException" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#at.gv.egovernment.moa.id.auth.MOAIDAuthInitializer" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#at.gv.egovernment.moa.id.auth.WrongParametersException" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#at.gv.egovernment.moa.id.auth.data.AuthenticationSession" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#at.gv.egovernment.moa.id.auth.servlet.AuthServlet" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#at.gv.egovernment.moa.id.config.auth.OAAuthParameter" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#at.gv.egovernment.moa.id.moduls.AuthenticationManager" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#at.gv.egovernment.moa.id.moduls.IAction" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#at.gv.egovernment.moa.id.moduls.IModulInfo" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#at.gv.egovernment.moa.id.moduls.IRequest" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#at.gv.egovernment.moa.id.moduls.ModulStorage" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#at.gv.egovernment.moa.id.moduls.NoPassivAuthenticationException" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#at.gv.egovernment.moa.id.moduls.RequestStorage" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#at.gv.egovernment.moa.id.moduls.SSOManager" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#at.gv.egovernment.moa.id.storage.ExceptionStoreImpl" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#at.gv.egovernment.moa.id.util.HTTPSessionUtils" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#at.gv.egovernment.moa.id.util.MOAIDMessageProvider" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#at.gv.egovernment.moa.id.util.Random" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#at.gv.egovernment.moa.id.util.legacy.LegacyHelper" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java#at.gv.egovernment.moa.logging.Logger" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java[DispatcherServlet" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java[DispatcherServlet~init~QServletConfig;" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java[DispatcherServlet~processRequest~QHttpServletRequest;~QHttpServletResponse;" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java[DispatcherServlet~doGet~QHttpServletRequest;~QHttpServletResponse;" />
-		<explicit-entry-point
-			handle="=moa-id-lib/src\/main\/java&lt;at.gv.egovernment.moa.id.entrypoints{DispatcherServlet.java[DispatcherServlet~doPost~QHttpServletRequest;~QHttpServletResponse;" />
-	</explicit-entry-points>
-	<include-main enabled="true" />
-	<include-tests enabled="false" />
-	<include-xml enabled="true" />
-</entry-points>
\ No newline at end of file
diff --git a/id/server/idserverlib/.gitignore b/id/server/idserverlib/.gitignore
deleted file mode 100644
index 4dc009173..000000000
--- a/id/server/idserverlib/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target
-/bin
diff --git a/id/server/idserverlib/.project b/id/server/idserverlib/.project
deleted file mode 100644
index 7520e9f8e..000000000
--- a/id/server/idserverlib/.project
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>moa-id-lib</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-	</natures>
-</projectDescription>
diff --git a/id/server/idserverlib/.settings/org.eclipse.core.resources.prefs b/id/server/idserverlib/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 839d647ee..000000000
--- a/id/server/idserverlib/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding/<project>=UTF-8
diff --git a/id/server/idserverlib/.settings/org.eclipse.jdt.core.prefs b/id/server/idserverlib/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 69c31cd49..000000000
--- a/id/server/idserverlib/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/id/server/idserverlib/.settings/org.eclipse.m2e.core.prefs b/id/server/idserverlib/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/id/server/idserverlib/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/id/server/idserverlib/.settings/org.eclipse.wst.common.component b/id/server/idserverlib/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 002edc99d..000000000
--- a/id/server/idserverlib/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-	<wb-module deploy-name="moa-id-lib">
-		<wb-resource deploy-path="/" source-path="src/main/java"/>
-		<wb-resource deploy-path="/" source-path="src/main/resources"/>
-        <wb-resource deploy-path="/" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/" source-path="/src/main/resources"/>
-	</wb-module>
-</project-modules>
diff --git a/id/server/idserverlib/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/idserverlib/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 0c619da6d..000000000
--- a/id/server/idserverlib/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="jst.java"/>
-  <fixed facet="jst.utility"/>
-  <installed facet="jst.utility" version="1.0"/>
-  <installed facet="jst.java" version="1.6"/>
-</faceted-project>
diff --git a/id/server/idserverlib/.settings/org.eclipse.wst.validation.prefs b/id/server/idserverlib/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 04cad8cb7..000000000
--- a/id/server/idserverlib/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
diff --git a/id/server/idserverlib/.settings/org.maven.ide.eclipse.prefs b/id/server/idserverlib/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 5fed4cf5a..000000000
--- a/id/server/idserverlib/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/id/server/moa-id-commons/.classpath b/id/server/moa-id-commons/.classpath
deleted file mode 100644
index a6c84d0a8..000000000
--- a/id/server/moa-id-commons/.classpath
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" path="target/generated-sources/xjc"/>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources/config">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/id/server/moa-id-commons/.gitignore b/id/server/moa-id-commons/.gitignore
deleted file mode 100644
index ea8c4bf7f..000000000
--- a/id/server/moa-id-commons/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/id/server/moa-id-commons/.project b/id/server/moa-id-commons/.project
deleted file mode 100644
index a7c3725f2..000000000
--- a/id/server/moa-id-commons/.project
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>moa-id-commons</name>
-	<comment></comment>
-	<projects>
-		<project>moa-common</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-	</natures>
-</projectDescription>
diff --git a/id/server/moa-id-commons/.settings/org.eclipse.core.resources.prefs b/id/server/moa-id-commons/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 95c6d7ddd..000000000
--- a/id/server/moa-id-commons/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/resources=UTF-8
-encoding//src/main/resources/config=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/id/server/moa-id-commons/.settings/org.eclipse.jdt.core.prefs b/id/server/moa-id-commons/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index abec6ca38..000000000
--- a/id/server/moa-id-commons/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/id/server/moa-id-commons/.settings/org.eclipse.jpt.core.prefs b/id/server/moa-id-commons/.settings/org.eclipse.jpt.core.prefs
deleted file mode 100644
index 3e2d23923..000000000
--- a/id/server/moa-id-commons/.settings/org.eclipse.jpt.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jpt.core.platform=generic
-org.eclipse.jpt.jpa.core.discoverAnnotatedClasses=true
diff --git a/id/server/moa-id-commons/.settings/org.eclipse.m2e.core.prefs b/id/server/moa-id-commons/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/id/server/moa-id-commons/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/id/server/moa-id-commons/.settings/org.eclipse.wst.common.component b/id/server/moa-id-commons/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 9e5e3ed1c..000000000
--- a/id/server/moa-id-commons/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="moa-id-commons">
-        <wb-resource deploy-path="/" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/" source-path="/target/generated-sources/xjc"/>
-        <wb-resource deploy-path="/" source-path="/src/main/resources/config"/>
-    </wb-module>
-</project-modules>
diff --git a/id/server/moa-id-commons/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/id/server/moa-id-commons/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
deleted file mode 100644
index 7961132fd..000000000
--- a/id/server/moa-id-commons/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<root>
-  <facet id="jpt.jpa">
-    <node name="libprov">
-      <attribute name="provider-id" value="jpa-no-op-library-provider"/>
-    </node>
-  </facet>
-</root>
diff --git a/id/server/moa-id-commons/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/moa-id-commons/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 8956fb143..000000000
--- a/id/server/moa-id-commons/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <installed facet="java" version="1.5"/>
-  <installed facet="jst.utility" version="1.0"/>
-  <installed facet="jpt.jpa" version="1.0"/>
-</faceted-project>
diff --git a/id/server/moa-id-commons/.settings/org.eclipse.wst.validation.prefs b/id/server/moa-id-commons/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 04cad8cb7..000000000
--- a/id/server/moa-id-commons/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 02915ef18..608ad0ed9 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -243,7 +243,7 @@
                 </executions>
             </plugin> -->
    
-<!--            	 <plugin>
+           	 <plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -260,7 +260,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin> -->
+        		</plugin>
                   
                 <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
                 <plugin>
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/xjc/JaxbBooleanAdapter.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/xjc/JaxbBooleanAdapter.java
deleted file mode 100644
index c1c841282..000000000
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/xjc/JaxbBooleanAdapter.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2014 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
- * http://www.osor.eu/eupl/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- */
-package at.gv.egovernment.moa.id.commons.xjc;
-
-/**
- * @author tlenz
- *
- */
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-/**
- * Utility class to correctly render the xml types used in JAXB.
- */
-public class JaxbBooleanAdapter extends XmlAdapter<String, Boolean>
-{
-    @Override
-    public Boolean unmarshal(String v) throws Exception
-    {
-        if ("1".equals(v))
-        {
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public String marshal(Boolean v) throws Exception
-    {
-        if (v == null)
-        {
-            return null;
-        }
-        if (v)
-        {
-            return "1";
-        }
-        return "0";
-    }
-}
diff --git a/id/server/pom.xml b/id/server/pom.xml
index f574a0cf2..cd2f82e84 100644
--- a/id/server/pom.xml
+++ b/id/server/pom.xml
@@ -28,7 +28,7 @@
 

     <build>

         <plugins>

-<!--         		<plugin>

+        		<plugin>

             		<groupId>org.codehaus.mojo</groupId>

             		<artifactId>properties-maven-plugin</artifactId>

             		<version>1.0-alpha-2</version>

@@ -45,7 +45,7 @@
           		          </configuration>

               		  </execution>

             		</executions>

-        		</plugin> -->

+        		</plugin>

         	</plugins>

        </build>

 

diff --git a/id/server/proxy/.classpath b/id/server/proxy/.classpath
deleted file mode 100644
index bc5aeac5e..000000000
--- a/id/server/proxy/.classpath
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/id/server/proxy/.gitignore b/id/server/proxy/.gitignore
deleted file mode 100644
index 4dc009173..000000000
--- a/id/server/proxy/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target
-/bin
diff --git a/id/server/proxy/.project b/id/server/proxy/.project
deleted file mode 100644
index 398564ccb..000000000
--- a/id/server/proxy/.project
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>moa-id-proxy</name>
-	<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-	<projects>
-		<project>moa-spss-lib</project>
-		<project>moa-common</project>
-		<project>stork-saml-engine</project>
-		<project>moa-id-commons</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-	</natures>
-</projectDescription>
diff --git a/id/server/proxy/.settings/org.eclipse.core.resources.prefs b/id/server/proxy/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c020..000000000
--- a/id/server/proxy/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/id/server/proxy/.settings/org.eclipse.jdt.core.prefs b/id/server/proxy/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 69c31cd49..000000000
--- a/id/server/proxy/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/id/server/proxy/.settings/org.eclipse.m2e.core.prefs b/id/server/proxy/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/id/server/proxy/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/id/server/proxy/.settings/org.eclipse.wst.common.component b/id/server/proxy/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 0c677de0e..000000000
--- a/id/server/proxy/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-  <wb-module deploy-name="moa-id-proxy">
-        <dependent-module archiveName="moa-spss-lib-2.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="moa-common-2.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="moa-id-lib-2.1.0-RC1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="moa-id-commons-2.1.0-RC1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-commons/moa-id-commons">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="SamlEngine-1.4.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/SamlEngine/SamlEngine">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="Commons-1.4.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/Commons/Commons">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-    <property name="context-root" value="moa-id-proxy"/>
-    <wb-resource deploy-path="/" source-path="src/main/webapp"/>
-    <property name="java-output-path" value="/target/classes"/>
-  </wb-module>
-</project-modules>
diff --git a/id/server/proxy/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/proxy/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 3d344ed7f..000000000
--- a/id/server/proxy/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="jst.java"/>
-  <fixed facet="jst.web"/>
-  <installed facet="jst.web" version="2.4"/>
-  <installed facet="jst.java" version="5.0"/>
-</faceted-project>
\ No newline at end of file
diff --git a/id/server/proxy/.settings/org.eclipse.wst.validation.prefs b/id/server/proxy/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 04cad8cb7..000000000
--- a/id/server/proxy/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
diff --git a/id/server/proxy/.settings/org.maven.ide.eclipse.prefs b/id/server/proxy/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 5fed4cf5a..000000000
--- a/id/server/proxy/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 2b74266f2..c7024e0ea 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -26,7 +26,7 @@
 	

 	<build>

 		<plugins>

-<!-- 				        <plugin>

+				        <plugin>

             		<groupId>org.codehaus.mojo</groupId>

             		<artifactId>properties-maven-plugin</artifactId>

             		<version>1.0-alpha-2</version>

@@ -43,7 +43,7 @@
           		          </configuration>

               		  </execution>

             		</executions>

-        		</plugin> -->

+        		</plugin>

 		

 			<plugin>

 				<groupId>org.apache.maven.plugins</groupId>

diff --git a/id/server/stork2-commons/.classpath b/id/server/stork2-commons/.classpath
deleted file mode 100644
index 550e3f2ae..000000000
--- a/id/server/stork2-commons/.classpath
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/id/server/stork2-commons/.gitignore b/id/server/stork2-commons/.gitignore
deleted file mode 100644
index ea8c4bf7f..000000000
--- a/id/server/stork2-commons/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/id/server/stork2-commons/.project b/id/server/stork2-commons/.project
deleted file mode 100644
index 07bf2ad7c..000000000
--- a/id/server/stork2-commons/.project
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Commons</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-	</natures>
-</projectDescription>
diff --git a/id/server/stork2-commons/.settings/org.eclipse.core.resources.prefs b/id/server/stork2-commons/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 29abf9995..000000000
--- a/id/server/stork2-commons/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/id/server/stork2-commons/.settings/org.eclipse.jdt.core.prefs b/id/server/stork2-commons/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 69c31cd49..000000000
--- a/id/server/stork2-commons/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/id/server/stork2-commons/.settings/org.eclipse.m2e.core.prefs b/id/server/stork2-commons/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/id/server/stork2-commons/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/id/server/stork2-commons/.settings/org.eclipse.wst.common.component b/id/server/stork2-commons/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 8a0a93c93..000000000
--- a/id/server/stork2-commons/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="Commons">
-        <wb-resource deploy-path="/" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/" source-path="/src/main/resources"/>
-    </wb-module>
-</project-modules>
diff --git a/id/server/stork2-commons/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/stork2-commons/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 5c9bd7532..000000000
--- a/id/server/stork2-commons/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <installed facet="jst.utility" version="1.0"/>
-  <installed facet="java" version="1.6"/>
-</faceted-project>
diff --git a/id/server/stork2-commons/.settings/org.eclipse.wst.validation.prefs b/id/server/stork2-commons/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 04cad8cb7..000000000
--- a/id/server/stork2-commons/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml
index c6d15b51b..e74f702a8 100644
--- a/id/server/stork2-commons/pom.xml
+++ b/id/server/stork2-commons/pom.xml
@@ -147,7 +147,7 @@
 		<plugins>
 		
 		           	 
-<!-- 		          <plugin>
+		          <plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -164,7 +164,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin> -->
+        		</plugin>
 		
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/id/server/stork2-commons/src/main/java/pvp_postbinding_template.html b/id/server/stork2-commons/src/main/java/pvp_postbinding_template.html
deleted file mode 100644
index 2f93428b5..000000000
--- a/id/server/stork2-commons/src/main/java/pvp_postbinding_template.html
+++ /dev/null
@@ -1,48 +0,0 @@
-## ## Velocity Template for SAML 2 HTTP-POST binding ## ## Velocity
-context may contain the following properties ## action - String - the
-action URL for the form ## RelayState - String - the relay state for the
-message ## SAMLRequest - String - the Base64 encoded SAML Request ##
-SAMLResponse - String - the Base64 encoded SAML Response
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-
-<body onload="document.forms[0].submit()">
-	<noscript>
-		<p>
-			<strong>Note:</strong> Since your browser does not support
-			JavaScript, you must press the Continue button once to proceed.
-		</p>
-	</noscript>
-
-
-	<div id="alert">Your login is being processed. Thank you for
-		waiting.</div>
-
-	<style type="text/css">
-<!--
-#alert {
-	margin: 100px 250px;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	font-weight: normal;
-}
--->
-</style>
-
-	<form action="${action}" method="post" target="_parent">
-		<div>
-			#if($RelayState)<input type="hidden" name="RelayState"
-				value="${RelayState}" />#end #if($SAMLRequest)<input type="hidden"
-				name="SAMLRequest" value="${SAMLRequest}" />#end #if($SAMLResponse)<input
-				type="hidden" name="SAMLResponse" value="${SAMLResponse}" />#end
-
-		</div>
-		<noscript>
-			<div>
-				<input type="submit" value="Continue" />
-			</div>
-		</noscript>
-	</form>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/id/server/stork2-commons/stork-commons.log b/id/server/stork2-commons/stork-commons.log
deleted file mode 100644
index b77d30898..000000000
--- a/id/server/stork2-commons/stork-commons.log
+++ /dev/null
@@ -1,432 +0,0 @@
-12:06:45:332 - INFO - PersonalAttributeList - get attributes by param :false
-12:06:45:336 - INFO - PersonalAttributeList - get attributes by param :true
-12:06:45:336 - INFO - PersonalAttributeList - adding attribute:age
-12:06:45:337 - INFO - PersonalAttributeList - get complex attributes
-12:06:45:337 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-12:06:45:337 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-12:06:45:349 - INFO - PersonalAttributeList - get attributes by param :false
-12:06:45:349 - INFO - PersonalAttributeList - adding attribute:age
-12:06:45:349 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-12:06:45:350 - INFO - PersonalAttributeList - get simple attributes
-12:06:45:350 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-12:06:45:352 - INFO - PersonalAttributeList - get complex attributes
-12:06:45:353 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-12:06:45:353 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-12:06:45:364 - INFO - PersonalAttributeList - get attributes by param :true
-12:06:45:368 - INFO - PersonalAttributeList - get attributes by param :true
-12:06:45:370 - INFO - PersonalAttributeList - adding attribute:age
-12:06:45:370 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-12:06:45:371 - INFO - PersonalAttributeList - get complex attributes
-12:06:45:372 - INFO - PersonalAttributeList - get attributes by param :false
-12:06:45:377 - INFO - PersonalAttributeList - get simple attributes
-12:06:45:377 - INFO - PersonalAttributeList - get attributes by param :false
-12:06:45:377 - INFO - PersonalAttributeList - adding attribute:age
-12:06:45:382 - INFO - PersonalAttributeList - get simple attributes
-12:06:45:382 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-12:06:45:382 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-12:06:45:383 - INFO - PersonalAttributeList - get attributes by param :true
-12:06:45:384 - INFO - PersonalAttributeList - get simple attributes
-12:06:45:386 - INFO - PersonalAttributeList - get complex attributes
-12:06:45:386 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-12:06:45:459 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-12:06:45:478 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-12:06:45:479 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-12:06:45:479 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-12:06:45:482 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-12:06:45:483 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-12:18:58:481 - INFO - PersonalAttributeList - get attributes by param :false
-12:18:58:486 - INFO - PersonalAttributeList - get attributes by param :true
-12:18:58:486 - INFO - PersonalAttributeList - adding attribute:age
-12:18:58:487 - INFO - PersonalAttributeList - get complex attributes
-12:18:58:487 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-12:18:58:487 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-12:18:58:498 - INFO - PersonalAttributeList - get attributes by param :false
-12:18:58:498 - INFO - PersonalAttributeList - adding attribute:age
-12:18:58:498 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-12:18:58:499 - INFO - PersonalAttributeList - get simple attributes
-12:18:58:499 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-12:18:58:500 - INFO - PersonalAttributeList - get complex attributes
-12:18:58:501 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-12:18:58:502 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-12:18:58:513 - INFO - PersonalAttributeList - get attributes by param :true
-12:18:58:518 - INFO - PersonalAttributeList - get attributes by param :true
-12:18:58:519 - INFO - PersonalAttributeList - adding attribute:age
-12:18:58:520 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-12:18:58:520 - INFO - PersonalAttributeList - get complex attributes
-12:18:58:521 - INFO - PersonalAttributeList - get attributes by param :false
-12:18:58:527 - INFO - PersonalAttributeList - get simple attributes
-12:18:58:527 - INFO - PersonalAttributeList - get attributes by param :false
-12:18:58:527 - INFO - PersonalAttributeList - adding attribute:age
-12:18:58:532 - INFO - PersonalAttributeList - get simple attributes
-12:18:58:533 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-12:18:58:533 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-12:18:58:534 - INFO - PersonalAttributeList - get attributes by param :true
-12:18:58:534 - INFO - PersonalAttributeList - get simple attributes
-12:18:58:536 - INFO - PersonalAttributeList - get complex attributes
-12:18:58:536 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-12:18:58:618 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-12:18:58:634 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-12:18:58:635 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-12:18:58:636 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-12:18:58:639 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-12:18:58:640 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-12:35:56:172 - INFO - PersonalAttributeList - get attributes by param :false
-12:35:56:174 - INFO - PersonalAttributeList - get attributes by param :true
-12:35:56:175 - INFO - PersonalAttributeList - adding attribute:age
-12:35:56:176 - INFO - PersonalAttributeList - get complex attributes
-12:35:56:176 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-12:35:56:176 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-12:35:56:185 - INFO - PersonalAttributeList - get attributes by param :false
-12:35:56:185 - INFO - PersonalAttributeList - adding attribute:age
-12:35:56:186 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-12:35:56:186 - INFO - PersonalAttributeList - get simple attributes
-12:35:56:186 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-12:35:56:187 - INFO - PersonalAttributeList - get complex attributes
-12:35:56:188 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-12:35:56:189 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-12:35:56:198 - INFO - PersonalAttributeList - get attributes by param :true
-12:35:56:204 - INFO - PersonalAttributeList - get attributes by param :true
-12:35:56:206 - INFO - PersonalAttributeList - adding attribute:age
-12:35:56:206 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-12:35:56:207 - INFO - PersonalAttributeList - get complex attributes
-12:35:56:208 - INFO - PersonalAttributeList - get attributes by param :false
-12:35:56:214 - INFO - PersonalAttributeList - get simple attributes
-12:35:56:214 - INFO - PersonalAttributeList - get attributes by param :false
-12:35:56:214 - INFO - PersonalAttributeList - adding attribute:age
-12:35:56:219 - INFO - PersonalAttributeList - get simple attributes
-12:35:56:219 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-12:35:56:220 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-12:35:56:220 - INFO - PersonalAttributeList - get attributes by param :true
-12:35:56:221 - INFO - PersonalAttributeList - get simple attributes
-12:35:56:223 - INFO - PersonalAttributeList - get complex attributes
-12:35:56:223 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-12:35:56:301 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-12:35:56:317 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-12:35:56:317 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-12:35:56:318 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-12:35:56:321 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-12:35:56:322 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-13:59:31:022 - INFO - PersonalAttributeList - get attributes by param :false
-13:59:31:025 - INFO - PersonalAttributeList - get attributes by param :true
-13:59:31:026 - INFO - PersonalAttributeList - adding attribute:age
-13:59:31:027 - INFO - PersonalAttributeList - get complex attributes
-13:59:31:027 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-13:59:31:027 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-13:59:31:037 - INFO - PersonalAttributeList - get attributes by param :false
-13:59:31:037 - INFO - PersonalAttributeList - adding attribute:age
-13:59:31:037 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-13:59:31:038 - INFO - PersonalAttributeList - get simple attributes
-13:59:31:038 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-13:59:31:039 - INFO - PersonalAttributeList - get complex attributes
-13:59:31:040 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-13:59:31:041 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-13:59:31:051 - INFO - PersonalAttributeList - get attributes by param :true
-13:59:31:056 - INFO - PersonalAttributeList - get attributes by param :true
-13:59:31:058 - INFO - PersonalAttributeList - adding attribute:age
-13:59:31:058 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-13:59:31:059 - INFO - PersonalAttributeList - get complex attributes
-13:59:31:060 - INFO - PersonalAttributeList - get attributes by param :false
-13:59:31:066 - INFO - PersonalAttributeList - get simple attributes
-13:59:31:067 - INFO - PersonalAttributeList - get attributes by param :false
-13:59:31:067 - INFO - PersonalAttributeList - adding attribute:age
-13:59:31:072 - INFO - PersonalAttributeList - get simple attributes
-13:59:31:072 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-13:59:31:072 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-13:59:31:073 - INFO - PersonalAttributeList - get attributes by param :true
-13:59:31:074 - INFO - PersonalAttributeList - get simple attributes
-13:59:31:076 - INFO - PersonalAttributeList - get complex attributes
-13:59:31:076 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-13:59:31:157 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-13:59:31:174 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-13:59:31:175 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-13:59:31:175 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-13:59:31:178 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-13:59:31:179 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-14:46:45:711 - INFO - PersonalAttributeList - get attributes by param :false
-14:46:45:714 - INFO - PersonalAttributeList - get attributes by param :true
-14:46:45:714 - INFO - PersonalAttributeList - adding attribute:age
-14:46:45:716 - INFO - PersonalAttributeList - get complex attributes
-14:46:45:716 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-14:46:45:716 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-14:46:45:726 - INFO - PersonalAttributeList - get attributes by param :false
-14:46:45:726 - INFO - PersonalAttributeList - adding attribute:age
-14:46:45:726 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-14:46:45:727 - INFO - PersonalAttributeList - get simple attributes
-14:46:45:727 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-14:46:45:728 - INFO - PersonalAttributeList - get complex attributes
-14:46:45:729 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-14:46:45:730 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-14:46:45:739 - INFO - PersonalAttributeList - get attributes by param :true
-14:46:45:744 - INFO - PersonalAttributeList - get attributes by param :true
-14:46:45:746 - INFO - PersonalAttributeList - adding attribute:age
-14:46:45:746 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-14:46:45:747 - INFO - PersonalAttributeList - get complex attributes
-14:46:45:747 - INFO - PersonalAttributeList - get attributes by param :false
-14:46:45:752 - INFO - PersonalAttributeList - get simple attributes
-14:46:45:753 - INFO - PersonalAttributeList - get attributes by param :false
-14:46:45:753 - INFO - PersonalAttributeList - adding attribute:age
-14:46:45:758 - INFO - PersonalAttributeList - get simple attributes
-14:46:45:758 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-14:46:45:758 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-14:46:45:759 - INFO - PersonalAttributeList - get attributes by param :true
-14:46:45:759 - INFO - PersonalAttributeList - get simple attributes
-14:46:45:761 - INFO - PersonalAttributeList - get complex attributes
-14:46:45:761 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-14:46:45:834 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-14:46:45:849 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-14:46:45:850 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-14:46:45:851 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-14:46:45:853 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-14:46:45:855 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-14:58:07:963 - INFO - PersonalAttributeList - get attributes by param :false
-14:58:07:966 - INFO - PersonalAttributeList - get attributes by param :true
-14:58:07:966 - INFO - PersonalAttributeList - adding attribute:age
-14:58:07:968 - INFO - PersonalAttributeList - get complex attributes
-14:58:07:968 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-14:58:07:968 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-14:58:07:979 - INFO - PersonalAttributeList - get attributes by param :false
-14:58:07:979 - INFO - PersonalAttributeList - adding attribute:age
-14:58:07:979 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-14:58:07:980 - INFO - PersonalAttributeList - get simple attributes
-14:58:07:980 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-14:58:07:981 - INFO - PersonalAttributeList - get complex attributes
-14:58:07:982 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-14:58:07:983 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-14:58:07:993 - INFO - PersonalAttributeList - get attributes by param :true
-14:58:07:997 - INFO - PersonalAttributeList - get attributes by param :true
-14:58:07:999 - INFO - PersonalAttributeList - adding attribute:age
-14:58:07:999 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-14:58:08:000 - INFO - PersonalAttributeList - get complex attributes
-14:58:08:000 - INFO - PersonalAttributeList - get attributes by param :false
-14:58:08:005 - INFO - PersonalAttributeList - get simple attributes
-14:58:08:006 - INFO - PersonalAttributeList - get attributes by param :false
-14:58:08:006 - INFO - PersonalAttributeList - adding attribute:age
-14:58:08:010 - INFO - PersonalAttributeList - get simple attributes
-14:58:08:011 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-14:58:08:011 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-14:58:08:012 - INFO - PersonalAttributeList - get attributes by param :true
-14:58:08:012 - INFO - PersonalAttributeList - get simple attributes
-14:58:08:014 - INFO - PersonalAttributeList - get complex attributes
-14:58:08:014 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-14:58:08:085 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-14:58:08:103 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-14:58:08:104 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-14:58:08:105 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-14:58:08:107 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-14:58:08:108 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-15:07:40:448 - INFO - PersonalAttributeList - get attributes by param :false
-15:07:40:451 - INFO - PersonalAttributeList - get attributes by param :true
-15:07:40:451 - INFO - PersonalAttributeList - adding attribute:age
-15:07:40:453 - INFO - PersonalAttributeList - get complex attributes
-15:07:40:453 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-15:07:40:453 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-15:07:40:464 - INFO - PersonalAttributeList - get attributes by param :false
-15:07:40:464 - INFO - PersonalAttributeList - adding attribute:age
-15:07:40:465 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-15:07:40:465 - INFO - PersonalAttributeList - get simple attributes
-15:07:40:465 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-15:07:40:466 - INFO - PersonalAttributeList - get complex attributes
-15:07:40:467 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-15:07:40:468 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-15:07:40:478 - INFO - PersonalAttributeList - get attributes by param :true
-15:07:40:483 - INFO - PersonalAttributeList - get attributes by param :true
-15:07:40:484 - INFO - PersonalAttributeList - adding attribute:age
-15:07:40:485 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-15:07:40:485 - INFO - PersonalAttributeList - get complex attributes
-15:07:40:486 - INFO - PersonalAttributeList - get attributes by param :false
-15:07:40:491 - INFO - PersonalAttributeList - get simple attributes
-15:07:40:492 - INFO - PersonalAttributeList - get attributes by param :false
-15:07:40:492 - INFO - PersonalAttributeList - adding attribute:age
-15:07:40:498 - INFO - PersonalAttributeList - get simple attributes
-15:07:40:498 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-15:07:40:499 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-15:07:40:500 - INFO - PersonalAttributeList - get attributes by param :true
-15:07:40:500 - INFO - PersonalAttributeList - get simple attributes
-15:07:40:503 - INFO - PersonalAttributeList - get complex attributes
-15:07:40:503 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-15:07:40:584 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-15:07:40:600 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-15:07:40:601 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-15:07:40:602 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-15:07:40:604 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-15:07:40:605 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-15:14:45:047 - INFO - PersonalAttributeList - get attributes by param :false
-15:14:45:050 - INFO - PersonalAttributeList - get attributes by param :true
-15:14:45:051 - INFO - PersonalAttributeList - adding attribute:age
-15:14:45:052 - INFO - PersonalAttributeList - get complex attributes
-15:14:45:052 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-15:14:45:052 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-15:14:45:062 - INFO - PersonalAttributeList - get attributes by param :false
-15:14:45:062 - INFO - PersonalAttributeList - adding attribute:age
-15:14:45:062 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-15:14:45:063 - INFO - PersonalAttributeList - get simple attributes
-15:14:45:063 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-15:14:45:064 - INFO - PersonalAttributeList - get complex attributes
-15:14:45:065 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-15:14:45:065 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-15:14:45:075 - INFO - PersonalAttributeList - get attributes by param :true
-15:14:45:079 - INFO - PersonalAttributeList - get attributes by param :true
-15:14:45:081 - INFO - PersonalAttributeList - adding attribute:age
-15:14:45:081 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-15:14:45:082 - INFO - PersonalAttributeList - get complex attributes
-15:14:45:082 - INFO - PersonalAttributeList - get attributes by param :false
-15:14:45:087 - INFO - PersonalAttributeList - get simple attributes
-15:14:45:088 - INFO - PersonalAttributeList - get attributes by param :false
-15:14:45:088 - INFO - PersonalAttributeList - adding attribute:age
-15:14:45:093 - INFO - PersonalAttributeList - get simple attributes
-15:14:45:093 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-15:14:45:094 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-15:14:45:095 - INFO - PersonalAttributeList - get attributes by param :true
-15:14:45:096 - INFO - PersonalAttributeList - get simple attributes
-15:14:45:098 - INFO - PersonalAttributeList - get complex attributes
-15:14:45:098 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-15:14:45:173 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-15:14:45:188 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-15:14:45:189 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-15:14:45:190 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-15:14:45:192 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-15:14:45:193 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-16:04:27:736 - INFO - PersonalAttributeList - get attributes by param :false
-16:04:27:739 - INFO - PersonalAttributeList - get attributes by param :true
-16:04:27:739 - INFO - PersonalAttributeList - adding attribute:age
-16:04:27:740 - INFO - PersonalAttributeList - get complex attributes
-16:04:27:741 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-16:04:27:741 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-16:04:27:753 - INFO - PersonalAttributeList - get attributes by param :false
-16:04:27:753 - INFO - PersonalAttributeList - adding attribute:age
-16:04:27:753 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-16:04:27:754 - INFO - PersonalAttributeList - get simple attributes
-16:04:27:755 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-16:04:27:756 - INFO - PersonalAttributeList - get complex attributes
-16:04:27:757 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-16:04:27:757 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-16:04:27:767 - INFO - PersonalAttributeList - get attributes by param :true
-16:04:27:772 - INFO - PersonalAttributeList - get attributes by param :true
-16:04:27:774 - INFO - PersonalAttributeList - adding attribute:age
-16:04:27:774 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-16:04:27:775 - INFO - PersonalAttributeList - get complex attributes
-16:04:27:775 - INFO - PersonalAttributeList - get attributes by param :false
-16:04:27:780 - INFO - PersonalAttributeList - get simple attributes
-16:04:27:781 - INFO - PersonalAttributeList - get attributes by param :false
-16:04:27:781 - INFO - PersonalAttributeList - adding attribute:age
-16:04:27:786 - INFO - PersonalAttributeList - get simple attributes
-16:04:27:787 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-16:04:27:787 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-16:04:27:788 - INFO - PersonalAttributeList - get attributes by param :true
-16:04:27:789 - INFO - PersonalAttributeList - get simple attributes
-16:04:27:791 - INFO - PersonalAttributeList - get complex attributes
-16:04:27:792 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-16:04:27:869 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-16:04:27:887 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-16:04:27:888 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-16:04:27:888 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-16:04:27:891 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-16:04:27:892 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-16:16:59:931 - INFO - PersonalAttributeList - get attributes by param :false
-16:16:59:936 - INFO - PersonalAttributeList - get attributes by param :true
-16:16:59:937 - INFO - PersonalAttributeList - adding attribute:age
-16:16:59:939 - INFO - PersonalAttributeList - get complex attributes
-16:16:59:939 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-16:16:59:939 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-16:16:59:951 - INFO - PersonalAttributeList - get attributes by param :false
-16:16:59:951 - INFO - PersonalAttributeList - adding attribute:age
-16:16:59:951 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-16:16:59:953 - INFO - PersonalAttributeList - get simple attributes
-16:16:59:953 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-16:16:59:954 - INFO - PersonalAttributeList - get complex attributes
-16:16:59:956 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-16:16:59:957 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-16:16:59:974 - INFO - PersonalAttributeList - get attributes by param :true
-16:16:59:979 - INFO - PersonalAttributeList - get attributes by param :true
-16:16:59:981 - INFO - PersonalAttributeList - adding attribute:age
-16:16:59:981 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-16:16:59:982 - INFO - PersonalAttributeList - get complex attributes
-16:16:59:983 - INFO - PersonalAttributeList - get attributes by param :false
-16:16:59:989 - INFO - PersonalAttributeList - get simple attributes
-16:16:59:990 - INFO - PersonalAttributeList - get attributes by param :false
-16:16:59:990 - INFO - PersonalAttributeList - adding attribute:age
-16:16:59:998 - INFO - PersonalAttributeList - get simple attributes
-16:16:59:998 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-16:16:59:998 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-16:16:59:999 - INFO - PersonalAttributeList - get attributes by param :true
-16:16:59:999 - INFO - PersonalAttributeList - get simple attributes
-16:17:00:002 - INFO - PersonalAttributeList - get complex attributes
-16:17:00:002 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-16:17:00:091 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-16:17:00:110 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-16:17:00:110 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-16:17:00:111 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-16:17:00:113 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-16:17:00:114 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-16:26:40:032 - INFO - PersonalAttributeList - get attributes by param :false
-16:26:40:036 - INFO - PersonalAttributeList - get attributes by param :true
-16:26:40:036 - INFO - PersonalAttributeList - adding attribute:age
-16:26:40:037 - INFO - PersonalAttributeList - get complex attributes
-16:26:40:037 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-16:26:40:037 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-16:26:40:049 - INFO - PersonalAttributeList - get attributes by param :false
-16:26:40:049 - INFO - PersonalAttributeList - adding attribute:age
-16:26:40:049 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-16:26:40:050 - INFO - PersonalAttributeList - get simple attributes
-16:26:40:050 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-16:26:40:051 - INFO - PersonalAttributeList - get complex attributes
-16:26:40:052 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-16:26:40:053 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-16:26:40:069 - INFO - PersonalAttributeList - get attributes by param :true
-16:26:40:075 - INFO - PersonalAttributeList - get attributes by param :true
-16:26:40:077 - INFO - PersonalAttributeList - adding attribute:age
-16:26:40:077 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-16:26:40:078 - INFO - PersonalAttributeList - get complex attributes
-16:26:40:079 - INFO - PersonalAttributeList - get attributes by param :false
-16:26:40:084 - INFO - PersonalAttributeList - get simple attributes
-16:26:40:084 - INFO - PersonalAttributeList - get attributes by param :false
-16:26:40:084 - INFO - PersonalAttributeList - adding attribute:age
-16:26:40:089 - INFO - PersonalAttributeList - get simple attributes
-16:26:40:089 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-16:26:40:089 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-16:26:40:090 - INFO - PersonalAttributeList - get attributes by param :true
-16:26:40:091 - INFO - PersonalAttributeList - get simple attributes
-16:26:40:093 - INFO - PersonalAttributeList - get complex attributes
-16:26:40:093 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-16:26:40:174 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-16:26:40:191 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-16:26:40:192 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-16:26:40:192 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-16:26:40:194 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-16:26:40:196 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-16:36:30:001 - INFO - PersonalAttributeList - get attributes by param :false
-16:36:30:005 - INFO - PersonalAttributeList - get attributes by param :true
-16:36:30:005 - INFO - PersonalAttributeList - adding attribute:age
-16:36:30:007 - INFO - PersonalAttributeList - get complex attributes
-16:36:30:007 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-16:36:30:008 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-16:36:30:021 - INFO - PersonalAttributeList - get attributes by param :false
-16:36:30:021 - INFO - PersonalAttributeList - adding attribute:age
-16:36:30:022 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-16:36:30:022 - INFO - PersonalAttributeList - get simple attributes
-16:36:30:023 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-16:36:30:024 - INFO - PersonalAttributeList - get complex attributes
-16:36:30:025 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-16:36:30:026 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-16:36:30:038 - INFO - PersonalAttributeList - get attributes by param :true
-16:36:30:044 - INFO - PersonalAttributeList - get attributes by param :true
-16:36:30:045 - INFO - PersonalAttributeList - adding attribute:age
-16:36:30:045 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-16:36:30:046 - INFO - PersonalAttributeList - get complex attributes
-16:36:30:047 - INFO - PersonalAttributeList - get attributes by param :false
-16:36:30:053 - INFO - PersonalAttributeList - get simple attributes
-16:36:30:054 - INFO - PersonalAttributeList - get attributes by param :false
-16:36:30:054 - INFO - PersonalAttributeList - adding attribute:age
-16:36:30:059 - INFO - PersonalAttributeList - get simple attributes
-16:36:30:060 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-16:36:30:060 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-16:36:30:061 - INFO - PersonalAttributeList - get attributes by param :true
-16:36:30:062 - INFO - PersonalAttributeList - get simple attributes
-16:36:30:066 - INFO - PersonalAttributeList - get complex attributes
-16:36:30:066 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-16:36:30:152 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-16:36:30:167 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-16:36:30:168 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-16:36:30:169 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-16:36:30:171 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-16:36:30:173 - WARN - DateUtil - Couldn't calculate Age, invalid date!
diff --git a/id/server/stork2-commons/stork-commons.log.2014-03-27 b/id/server/stork2-commons/stork-commons.log.2014-03-27
deleted file mode 100644
index 328327b03..000000000
--- a/id/server/stork2-commons/stork-commons.log.2014-03-27
+++ /dev/null
@@ -1,432 +0,0 @@
-10:41:32:538 - INFO - PersonalAttributeList - get attributes by param :false
-10:41:32:541 - INFO - PersonalAttributeList - get attributes by param :true
-10:41:32:541 - INFO - PersonalAttributeList - adding attribute:age
-10:41:32:542 - INFO - PersonalAttributeList - get complex attributes
-10:41:32:542 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-10:41:32:542 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-10:41:32:550 - INFO - PersonalAttributeList - get attributes by param :false
-10:41:32:550 - INFO - PersonalAttributeList - adding attribute:age
-10:41:32:551 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-10:41:32:551 - INFO - PersonalAttributeList - get simple attributes
-10:41:32:551 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-10:41:32:552 - INFO - PersonalAttributeList - get complex attributes
-10:41:32:553 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-10:41:32:554 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-10:41:32:563 - INFO - PersonalAttributeList - get attributes by param :true
-10:41:32:567 - INFO - PersonalAttributeList - get attributes by param :true
-10:41:32:568 - INFO - PersonalAttributeList - adding attribute:age
-10:41:32:568 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-10:41:32:569 - INFO - PersonalAttributeList - get complex attributes
-10:41:32:570 - INFO - PersonalAttributeList - get attributes by param :false
-10:41:32:574 - INFO - PersonalAttributeList - get simple attributes
-10:41:32:575 - INFO - PersonalAttributeList - get attributes by param :false
-10:41:32:575 - INFO - PersonalAttributeList - adding attribute:age
-10:41:32:579 - INFO - PersonalAttributeList - get simple attributes
-10:41:32:579 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-10:41:32:579 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-10:41:32:580 - INFO - PersonalAttributeList - get attributes by param :true
-10:41:32:580 - INFO - PersonalAttributeList - get simple attributes
-10:41:32:582 - INFO - PersonalAttributeList - get complex attributes
-10:41:32:582 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-10:41:32:670 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-10:41:32:687 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-10:41:32:688 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-10:41:32:689 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-10:41:32:691 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-10:41:32:692 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-10:44:50:129 - INFO - PersonalAttributeList - get attributes by param :false
-10:44:50:132 - INFO - PersonalAttributeList - get attributes by param :true
-10:44:50:132 - INFO - PersonalAttributeList - adding attribute:age
-10:44:50:133 - INFO - PersonalAttributeList - get complex attributes
-10:44:50:133 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-10:44:50:134 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-10:44:50:142 - INFO - PersonalAttributeList - get attributes by param :false
-10:44:50:142 - INFO - PersonalAttributeList - adding attribute:age
-10:44:50:142 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-10:44:50:143 - INFO - PersonalAttributeList - get simple attributes
-10:44:50:143 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-10:44:50:144 - INFO - PersonalAttributeList - get complex attributes
-10:44:50:145 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-10:44:50:145 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-10:44:50:154 - INFO - PersonalAttributeList - get attributes by param :true
-10:44:50:158 - INFO - PersonalAttributeList - get attributes by param :true
-10:44:50:160 - INFO - PersonalAttributeList - adding attribute:age
-10:44:50:160 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-10:44:50:161 - INFO - PersonalAttributeList - get complex attributes
-10:44:50:161 - INFO - PersonalAttributeList - get attributes by param :false
-10:44:50:166 - INFO - PersonalAttributeList - get simple attributes
-10:44:50:167 - INFO - PersonalAttributeList - get attributes by param :false
-10:44:50:167 - INFO - PersonalAttributeList - adding attribute:age
-10:44:50:171 - INFO - PersonalAttributeList - get simple attributes
-10:44:50:171 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-10:44:50:172 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-10:44:50:172 - INFO - PersonalAttributeList - get attributes by param :true
-10:44:50:173 - INFO - PersonalAttributeList - get simple attributes
-10:44:50:175 - INFO - PersonalAttributeList - get complex attributes
-10:44:50:175 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-10:44:50:245 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-10:44:50:259 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-10:44:50:260 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-10:44:50:261 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-10:44:50:263 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-10:44:50:264 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-12:07:34:296 - INFO - PersonalAttributeList - get attributes by param :false
-12:07:34:299 - INFO - PersonalAttributeList - get attributes by param :true
-12:07:34:299 - INFO - PersonalAttributeList - adding attribute:age
-12:07:34:300 - INFO - PersonalAttributeList - get complex attributes
-12:07:34:300 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-12:07:34:300 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-12:07:34:309 - INFO - PersonalAttributeList - get attributes by param :false
-12:07:34:309 - INFO - PersonalAttributeList - adding attribute:age
-12:07:34:309 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-12:07:34:310 - INFO - PersonalAttributeList - get simple attributes
-12:07:34:310 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-12:07:34:311 - INFO - PersonalAttributeList - get complex attributes
-12:07:34:312 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-12:07:34:313 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-12:07:34:321 - INFO - PersonalAttributeList - get attributes by param :true
-12:07:34:326 - INFO - PersonalAttributeList - get attributes by param :true
-12:07:34:327 - INFO - PersonalAttributeList - adding attribute:age
-12:07:34:327 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-12:07:34:328 - INFO - PersonalAttributeList - get complex attributes
-12:07:34:329 - INFO - PersonalAttributeList - get attributes by param :false
-12:07:34:333 - INFO - PersonalAttributeList - get simple attributes
-12:07:34:334 - INFO - PersonalAttributeList - get attributes by param :false
-12:07:34:334 - INFO - PersonalAttributeList - adding attribute:age
-12:07:34:339 - INFO - PersonalAttributeList - get simple attributes
-12:07:34:339 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-12:07:34:339 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-12:07:34:340 - INFO - PersonalAttributeList - get attributes by param :true
-12:07:34:340 - INFO - PersonalAttributeList - get simple attributes
-12:07:34:342 - INFO - PersonalAttributeList - get complex attributes
-12:07:34:342 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-12:07:34:410 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-12:07:34:425 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-12:07:34:426 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-12:07:34:426 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-12:07:34:428 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-12:07:34:429 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-13:18:37:550 - INFO - PersonalAttributeList - get attributes by param :false
-13:18:37:552 - INFO - PersonalAttributeList - get attributes by param :true
-13:18:37:552 - INFO - PersonalAttributeList - adding attribute:age
-13:18:37:554 - INFO - PersonalAttributeList - get complex attributes
-13:18:37:554 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-13:18:37:554 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-13:18:37:562 - INFO - PersonalAttributeList - get attributes by param :false
-13:18:37:562 - INFO - PersonalAttributeList - adding attribute:age
-13:18:37:562 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-13:18:37:563 - INFO - PersonalAttributeList - get simple attributes
-13:18:37:563 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-13:18:37:564 - INFO - PersonalAttributeList - get complex attributes
-13:18:37:565 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-13:18:37:565 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-13:18:37:574 - INFO - PersonalAttributeList - get attributes by param :true
-13:18:37:578 - INFO - PersonalAttributeList - get attributes by param :true
-13:18:37:580 - INFO - PersonalAttributeList - adding attribute:age
-13:18:37:580 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-13:18:37:581 - INFO - PersonalAttributeList - get complex attributes
-13:18:37:581 - INFO - PersonalAttributeList - get attributes by param :false
-13:18:37:586 - INFO - PersonalAttributeList - get simple attributes
-13:18:37:586 - INFO - PersonalAttributeList - get attributes by param :false
-13:18:37:586 - INFO - PersonalAttributeList - adding attribute:age
-13:18:37:591 - INFO - PersonalAttributeList - get simple attributes
-13:18:37:591 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-13:18:37:591 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-13:18:37:592 - INFO - PersonalAttributeList - get attributes by param :true
-13:18:37:592 - INFO - PersonalAttributeList - get simple attributes
-13:18:37:594 - INFO - PersonalAttributeList - get complex attributes
-13:18:37:594 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-13:18:37:662 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-13:18:37:677 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-13:18:37:678 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-13:18:37:678 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-13:18:37:681 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-13:18:37:682 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-13:25:32:941 - INFO - PersonalAttributeList - get attributes by param :false
-13:25:32:944 - INFO - PersonalAttributeList - get attributes by param :true
-13:25:32:945 - INFO - PersonalAttributeList - adding attribute:age
-13:25:32:946 - INFO - PersonalAttributeList - get complex attributes
-13:25:32:946 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-13:25:32:946 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-13:25:32:956 - INFO - PersonalAttributeList - get attributes by param :false
-13:25:32:956 - INFO - PersonalAttributeList - adding attribute:age
-13:25:32:956 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-13:25:32:957 - INFO - PersonalAttributeList - get simple attributes
-13:25:32:957 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-13:25:32:958 - INFO - PersonalAttributeList - get complex attributes
-13:25:32:959 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-13:25:32:960 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-13:25:32:969 - INFO - PersonalAttributeList - get attributes by param :true
-13:25:32:975 - INFO - PersonalAttributeList - get attributes by param :true
-13:25:32:976 - INFO - PersonalAttributeList - adding attribute:age
-13:25:32:976 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-13:25:32:977 - INFO - PersonalAttributeList - get complex attributes
-13:25:32:980 - INFO - PersonalAttributeList - get attributes by param :false
-13:25:32:984 - INFO - PersonalAttributeList - get simple attributes
-13:25:32:985 - INFO - PersonalAttributeList - get attributes by param :false
-13:25:32:985 - INFO - PersonalAttributeList - adding attribute:age
-13:25:32:990 - INFO - PersonalAttributeList - get simple attributes
-13:25:32:990 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-13:25:32:990 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-13:25:32:991 - INFO - PersonalAttributeList - get attributes by param :true
-13:25:32:991 - INFO - PersonalAttributeList - get simple attributes
-13:25:32:993 - INFO - PersonalAttributeList - get complex attributes
-13:25:32:993 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-13:25:33:064 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-13:25:33:079 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-13:25:33:080 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-13:25:33:081 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-13:25:33:083 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-13:25:33:084 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-13:33:46:826 - INFO - PersonalAttributeList - get attributes by param :false
-13:33:46:829 - INFO - PersonalAttributeList - get attributes by param :true
-13:33:46:829 - INFO - PersonalAttributeList - adding attribute:age
-13:33:46:830 - INFO - PersonalAttributeList - get complex attributes
-13:33:46:830 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-13:33:46:830 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-13:33:46:839 - INFO - PersonalAttributeList - get attributes by param :false
-13:33:46:839 - INFO - PersonalAttributeList - adding attribute:age
-13:33:46:839 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-13:33:46:840 - INFO - PersonalAttributeList - get simple attributes
-13:33:46:840 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-13:33:46:841 - INFO - PersonalAttributeList - get complex attributes
-13:33:46:842 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-13:33:46:843 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-13:33:46:854 - INFO - PersonalAttributeList - get attributes by param :true
-13:33:46:859 - INFO - PersonalAttributeList - get attributes by param :true
-13:33:46:860 - INFO - PersonalAttributeList - adding attribute:age
-13:33:46:860 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-13:33:46:861 - INFO - PersonalAttributeList - get complex attributes
-13:33:46:862 - INFO - PersonalAttributeList - get attributes by param :false
-13:33:46:867 - INFO - PersonalAttributeList - get simple attributes
-13:33:46:867 - INFO - PersonalAttributeList - get attributes by param :false
-13:33:46:867 - INFO - PersonalAttributeList - adding attribute:age
-13:33:46:872 - INFO - PersonalAttributeList - get simple attributes
-13:33:46:872 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-13:33:46:872 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-13:33:46:873 - INFO - PersonalAttributeList - get attributes by param :true
-13:33:46:873 - INFO - PersonalAttributeList - get simple attributes
-13:33:46:875 - INFO - PersonalAttributeList - get complex attributes
-13:33:46:875 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-13:33:46:947 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-13:33:46:962 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-13:33:46:963 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-13:33:46:963 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-13:33:46:967 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-13:33:46:968 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-15:59:26:954 - INFO - PersonalAttributeList - get attributes by param :false
-15:59:26:956 - INFO - PersonalAttributeList - get attributes by param :true
-15:59:26:957 - INFO - PersonalAttributeList - adding attribute:age
-15:59:26:958 - INFO - PersonalAttributeList - get complex attributes
-15:59:26:958 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-15:59:26:958 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-15:59:26:967 - INFO - PersonalAttributeList - get attributes by param :false
-15:59:26:967 - INFO - PersonalAttributeList - adding attribute:age
-15:59:26:967 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-15:59:26:968 - INFO - PersonalAttributeList - get simple attributes
-15:59:26:968 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-15:59:26:969 - INFO - PersonalAttributeList - get complex attributes
-15:59:26:970 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-15:59:26:971 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-15:59:26:980 - INFO - PersonalAttributeList - get attributes by param :true
-15:59:26:985 - INFO - PersonalAttributeList - get attributes by param :true
-15:59:26:987 - INFO - PersonalAttributeList - adding attribute:age
-15:59:26:987 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-15:59:26:987 - INFO - PersonalAttributeList - get complex attributes
-15:59:26:988 - INFO - PersonalAttributeList - get attributes by param :false
-15:59:26:993 - INFO - PersonalAttributeList - get simple attributes
-15:59:26:993 - INFO - PersonalAttributeList - get attributes by param :false
-15:59:26:994 - INFO - PersonalAttributeList - adding attribute:age
-15:59:26:998 - INFO - PersonalAttributeList - get simple attributes
-15:59:26:998 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-15:59:26:998 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-15:59:26:999 - INFO - PersonalAttributeList - get attributes by param :true
-15:59:27:000 - INFO - PersonalAttributeList - get simple attributes
-15:59:27:002 - INFO - PersonalAttributeList - get complex attributes
-15:59:27:002 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-15:59:27:071 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-15:59:27:086 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-15:59:27:087 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-15:59:27:088 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-15:59:27:090 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-15:59:27:091 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-17:23:25:411 - INFO - PersonalAttributeList - get attributes by param :false
-17:23:25:414 - INFO - PersonalAttributeList - get attributes by param :true
-17:23:25:414 - INFO - PersonalAttributeList - adding attribute:age
-17:23:25:415 - INFO - PersonalAttributeList - get complex attributes
-17:23:25:415 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-17:23:25:416 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-17:23:25:424 - INFO - PersonalAttributeList - get attributes by param :false
-17:23:25:424 - INFO - PersonalAttributeList - adding attribute:age
-17:23:25:424 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-17:23:25:425 - INFO - PersonalAttributeList - get simple attributes
-17:23:25:425 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-17:23:25:426 - INFO - PersonalAttributeList - get complex attributes
-17:23:25:427 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-17:23:25:427 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-17:23:25:436 - INFO - PersonalAttributeList - get attributes by param :true
-17:23:25:441 - INFO - PersonalAttributeList - get attributes by param :true
-17:23:25:442 - INFO - PersonalAttributeList - adding attribute:age
-17:23:25:442 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-17:23:25:443 - INFO - PersonalAttributeList - get complex attributes
-17:23:25:443 - INFO - PersonalAttributeList - get attributes by param :false
-17:23:25:448 - INFO - PersonalAttributeList - get simple attributes
-17:23:25:448 - INFO - PersonalAttributeList - get attributes by param :false
-17:23:25:448 - INFO - PersonalAttributeList - adding attribute:age
-17:23:25:453 - INFO - PersonalAttributeList - get simple attributes
-17:23:25:453 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-17:23:25:453 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-17:23:25:454 - INFO - PersonalAttributeList - get attributes by param :true
-17:23:25:454 - INFO - PersonalAttributeList - get simple attributes
-17:23:25:456 - INFO - PersonalAttributeList - get complex attributes
-17:23:25:457 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-17:23:25:525 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-17:23:25:539 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-17:23:25:540 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-17:23:25:541 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-17:23:25:543 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-17:23:25:544 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-18:26:58:453 - INFO - PersonalAttributeList - get attributes by param :false
-18:26:58:456 - INFO - PersonalAttributeList - get attributes by param :true
-18:26:58:456 - INFO - PersonalAttributeList - adding attribute:age
-18:26:58:457 - INFO - PersonalAttributeList - get complex attributes
-18:26:58:457 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-18:26:58:457 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-18:26:58:466 - INFO - PersonalAttributeList - get attributes by param :false
-18:26:58:466 - INFO - PersonalAttributeList - adding attribute:age
-18:26:58:466 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-18:26:58:467 - INFO - PersonalAttributeList - get simple attributes
-18:26:58:467 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-18:26:58:468 - INFO - PersonalAttributeList - get complex attributes
-18:26:58:469 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-18:26:58:469 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-18:26:58:478 - INFO - PersonalAttributeList - get attributes by param :true
-18:26:58:483 - INFO - PersonalAttributeList - get attributes by param :true
-18:26:58:484 - INFO - PersonalAttributeList - adding attribute:age
-18:26:58:484 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-18:26:58:485 - INFO - PersonalAttributeList - get complex attributes
-18:26:58:486 - INFO - PersonalAttributeList - get attributes by param :false
-18:26:58:490 - INFO - PersonalAttributeList - get simple attributes
-18:26:58:491 - INFO - PersonalAttributeList - get attributes by param :false
-18:26:58:491 - INFO - PersonalAttributeList - adding attribute:age
-18:26:58:495 - INFO - PersonalAttributeList - get simple attributes
-18:26:58:495 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-18:26:58:496 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-18:26:58:496 - INFO - PersonalAttributeList - get attributes by param :true
-18:26:58:497 - INFO - PersonalAttributeList - get simple attributes
-18:26:58:499 - INFO - PersonalAttributeList - get complex attributes
-18:26:58:499 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-18:26:58:568 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-18:26:58:583 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-18:26:58:584 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-18:26:58:584 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-18:26:58:587 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-18:26:58:588 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-18:41:25:070 - INFO - PersonalAttributeList - get attributes by param :false
-18:41:25:072 - INFO - PersonalAttributeList - get attributes by param :true
-18:41:25:073 - INFO - PersonalAttributeList - adding attribute:age
-18:41:25:074 - INFO - PersonalAttributeList - get complex attributes
-18:41:25:074 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-18:41:25:074 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-18:41:25:082 - INFO - PersonalAttributeList - get attributes by param :false
-18:41:25:082 - INFO - PersonalAttributeList - adding attribute:age
-18:41:25:082 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-18:41:25:083 - INFO - PersonalAttributeList - get simple attributes
-18:41:25:083 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-18:41:25:084 - INFO - PersonalAttributeList - get complex attributes
-18:41:25:085 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-18:41:25:086 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-18:41:25:096 - INFO - PersonalAttributeList - get attributes by param :true
-18:41:25:101 - INFO - PersonalAttributeList - get attributes by param :true
-18:41:25:102 - INFO - PersonalAttributeList - adding attribute:age
-18:41:25:102 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-18:41:25:103 - INFO - PersonalAttributeList - get complex attributes
-18:41:25:104 - INFO - PersonalAttributeList - get attributes by param :false
-18:41:25:109 - INFO - PersonalAttributeList - get simple attributes
-18:41:25:109 - INFO - PersonalAttributeList - get attributes by param :false
-18:41:25:109 - INFO - PersonalAttributeList - adding attribute:age
-18:41:25:115 - INFO - PersonalAttributeList - get simple attributes
-18:41:25:115 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-18:41:25:115 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-18:41:25:116 - INFO - PersonalAttributeList - get attributes by param :true
-18:41:25:117 - INFO - PersonalAttributeList - get simple attributes
-18:41:25:119 - INFO - PersonalAttributeList - get complex attributes
-18:41:25:119 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-18:41:25:195 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-18:41:25:212 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-18:41:25:213 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-18:41:25:214 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-18:41:25:218 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-18:41:25:219 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-19:15:13:721 - INFO - PersonalAttributeList - get attributes by param :false
-19:15:13:724 - INFO - PersonalAttributeList - get attributes by param :true
-19:15:13:725 - INFO - PersonalAttributeList - adding attribute:age
-19:15:13:726 - INFO - PersonalAttributeList - get complex attributes
-19:15:13:726 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-19:15:13:726 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-19:15:13:735 - INFO - PersonalAttributeList - get attributes by param :false
-19:15:13:735 - INFO - PersonalAttributeList - adding attribute:age
-19:15:13:735 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-19:15:13:736 - INFO - PersonalAttributeList - get simple attributes
-19:15:13:736 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-19:15:13:737 - INFO - PersonalAttributeList - get complex attributes
-19:15:13:738 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-19:15:13:739 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-19:15:13:750 - INFO - PersonalAttributeList - get attributes by param :true
-19:15:13:757 - INFO - PersonalAttributeList - get attributes by param :true
-19:15:13:759 - INFO - PersonalAttributeList - adding attribute:age
-19:15:13:759 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-19:15:13:760 - INFO - PersonalAttributeList - get complex attributes
-19:15:13:761 - INFO - PersonalAttributeList - get attributes by param :false
-19:15:13:767 - INFO - PersonalAttributeList - get simple attributes
-19:15:13:767 - INFO - PersonalAttributeList - get attributes by param :false
-19:15:13:767 - INFO - PersonalAttributeList - adding attribute:age
-19:15:13:772 - INFO - PersonalAttributeList - get simple attributes
-19:15:13:772 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-19:15:13:772 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-19:15:13:773 - INFO - PersonalAttributeList - get attributes by param :true
-19:15:13:774 - INFO - PersonalAttributeList - get simple attributes
-19:15:13:776 - INFO - PersonalAttributeList - get complex attributes
-19:15:13:776 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-19:15:13:870 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-19:15:13:885 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-19:15:13:886 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-19:15:13:887 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-19:15:13:890 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-19:15:13:891 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-20:09:34:513 - INFO - PersonalAttributeList - get attributes by param :false
-20:09:34:513 - INFO - PersonalAttributeList - get attributes by param :true
-20:09:34:513 - INFO - PersonalAttributeList - adding attribute:age
-20:09:34:513 - INFO - PersonalAttributeList - get complex attributes
-20:09:34:513 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-20:09:34:513 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-20:09:34:523 - INFO - PersonalAttributeList - get attributes by param :false
-20:09:34:523 - INFO - PersonalAttributeList - adding attribute:age
-20:09:34:523 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-20:09:34:523 - INFO - PersonalAttributeList - get simple attributes
-20:09:34:523 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-20:09:34:523 - INFO - PersonalAttributeList - get complex attributes
-20:09:34:523 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-20:09:34:533 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-20:09:34:543 - INFO - PersonalAttributeList - get attributes by param :true
-20:09:34:543 - INFO - PersonalAttributeList - get attributes by param :true
-20:09:34:543 - INFO - PersonalAttributeList - adding attribute:age
-20:09:34:543 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-20:09:34:543 - INFO - PersonalAttributeList - get complex attributes
-20:09:34:543 - INFO - PersonalAttributeList - get attributes by param :false
-20:09:34:553 - INFO - PersonalAttributeList - get simple attributes
-20:09:34:553 - INFO - PersonalAttributeList - get attributes by param :false
-20:09:34:553 - INFO - PersonalAttributeList - adding attribute:age
-20:09:34:563 - INFO - PersonalAttributeList - get simple attributes
-20:09:34:563 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-20:09:34:563 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-20:09:34:563 - INFO - PersonalAttributeList - get attributes by param :true
-20:09:34:563 - INFO - PersonalAttributeList - get simple attributes
-20:09:34:563 - INFO - PersonalAttributeList - get complex attributes
-20:09:34:563 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-20:09:34:633 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-20:09:34:653 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-20:09:34:653 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-20:09:34:653 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-20:09:34:653 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-20:09:34:663 - WARN - DateUtil - Couldn't calculate Age, invalid date!
diff --git a/id/server/stork2-commons/stork-commons.log.2014-03-28 b/id/server/stork2-commons/stork-commons.log.2014-03-28
deleted file mode 100644
index 64f279f26..000000000
--- a/id/server/stork2-commons/stork-commons.log.2014-03-28
+++ /dev/null
@@ -1,108 +0,0 @@
-07:07:03:244 - INFO - PersonalAttributeList - get attributes by param :false
-07:07:03:254 - INFO - PersonalAttributeList - get attributes by param :true
-07:07:03:254 - INFO - PersonalAttributeList - adding attribute:age
-07:07:03:254 - INFO - PersonalAttributeList - get complex attributes
-07:07:03:254 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-07:07:03:254 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-07:07:03:264 - INFO - PersonalAttributeList - get attributes by param :false
-07:07:03:264 - INFO - PersonalAttributeList - adding attribute:age
-07:07:03:264 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-07:07:03:264 - INFO - PersonalAttributeList - get simple attributes
-07:07:03:264 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-07:07:03:264 - INFO - PersonalAttributeList - get complex attributes
-07:07:03:274 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-07:07:03:274 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-07:07:03:284 - INFO - PersonalAttributeList - get attributes by param :true
-07:07:03:294 - INFO - PersonalAttributeList - get attributes by param :true
-07:07:03:294 - INFO - PersonalAttributeList - adding attribute:age
-07:07:03:294 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-07:07:03:294 - INFO - PersonalAttributeList - get complex attributes
-07:07:03:294 - INFO - PersonalAttributeList - get attributes by param :false
-07:07:03:294 - INFO - PersonalAttributeList - get simple attributes
-07:07:03:294 - INFO - PersonalAttributeList - get attributes by param :false
-07:07:03:294 - INFO - PersonalAttributeList - adding attribute:age
-07:07:03:304 - INFO - PersonalAttributeList - get simple attributes
-07:07:03:304 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-07:07:03:304 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-07:07:03:304 - INFO - PersonalAttributeList - get attributes by param :true
-07:07:03:304 - INFO - PersonalAttributeList - get simple attributes
-07:07:03:304 - INFO - PersonalAttributeList - get complex attributes
-07:07:03:304 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-07:07:03:385 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-07:07:03:395 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-07:07:03:395 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-07:07:03:395 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-07:07:03:405 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-07:07:03:405 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-07:38:33:747 - INFO - PersonalAttributeList - get attributes by param :false
-07:38:33:757 - INFO - PersonalAttributeList - get attributes by param :true
-07:38:33:757 - INFO - PersonalAttributeList - adding attribute:age
-07:38:33:757 - INFO - PersonalAttributeList - get complex attributes
-07:38:33:757 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-07:38:33:757 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-07:38:33:767 - INFO - PersonalAttributeList - get attributes by param :false
-07:38:33:767 - INFO - PersonalAttributeList - adding attribute:age
-07:38:33:767 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-07:38:33:767 - INFO - PersonalAttributeList - get simple attributes
-07:38:33:767 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-07:38:33:767 - INFO - PersonalAttributeList - get complex attributes
-07:38:33:767 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-07:38:33:767 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-07:38:33:777 - INFO - PersonalAttributeList - get attributes by param :true
-07:38:33:777 - INFO - PersonalAttributeList - get attributes by param :true
-07:38:33:787 - INFO - PersonalAttributeList - adding attribute:age
-07:38:33:787 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-07:38:33:787 - INFO - PersonalAttributeList - get complex attributes
-07:38:33:787 - INFO - PersonalAttributeList - get attributes by param :false
-07:38:33:787 - INFO - PersonalAttributeList - get simple attributes
-07:38:33:787 - INFO - PersonalAttributeList - get attributes by param :false
-07:38:33:787 - INFO - PersonalAttributeList - adding attribute:age
-07:38:33:797 - INFO - PersonalAttributeList - get simple attributes
-07:38:33:797 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-07:38:33:797 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-07:38:33:797 - INFO - PersonalAttributeList - get attributes by param :true
-07:38:33:797 - INFO - PersonalAttributeList - get simple attributes
-07:38:33:797 - INFO - PersonalAttributeList - get complex attributes
-07:38:33:797 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-07:38:33:867 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-07:38:33:877 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-07:38:33:887 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-07:38:33:887 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-07:38:33:887 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-07:38:33:887 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-08:52:53:377 - INFO - PersonalAttributeList - get attributes by param :false
-08:52:53:387 - INFO - PersonalAttributeList - get attributes by param :true
-08:52:53:387 - INFO - PersonalAttributeList - adding attribute:age
-08:52:53:387 - INFO - PersonalAttributeList - get complex attributes
-08:52:53:387 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-08:52:53:387 - INFO - PersonalAttributeList - adding complex attribute:mandateContent
-08:52:53:397 - INFO - PersonalAttributeList - get attributes by param :false
-08:52:53:397 - INFO - PersonalAttributeList - adding attribute:age
-08:52:53:397 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-08:52:53:397 - INFO - PersonalAttributeList - get simple attributes
-08:52:53:397 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-08:52:53:397 - INFO - PersonalAttributeList - get complex attributes
-08:52:53:397 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-08:52:53:397 - WARN - PersonalAttributeList - Invalid personal attribute list tuples
-08:52:53:407 - INFO - PersonalAttributeList - get attributes by param :true
-08:52:53:417 - INFO - PersonalAttributeList - get attributes by param :true
-08:52:53:417 - INFO - PersonalAttributeList - adding attribute:age
-08:52:53:417 - INFO - PersonalAttributeList - adding attribute:isAgeOver
-08:52:53:417 - INFO - PersonalAttributeList - get complex attributes
-08:52:53:417 - INFO - PersonalAttributeList - get attributes by param :false
-08:52:53:417 - INFO - PersonalAttributeList - get simple attributes
-08:52:53:427 - INFO - PersonalAttributeList - get attributes by param :false
-08:52:53:427 - INFO - PersonalAttributeList - adding attribute:age
-08:52:53:427 - INFO - PersonalAttributeList - get simple attributes
-08:52:53:427 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-08:52:53:427 - INFO - PersonalAttributeList - adding simple attribute:isAgeOver
-08:52:53:427 - INFO - PersonalAttributeList - get attributes by param :true
-08:52:53:427 - INFO - PersonalAttributeList - get simple attributes
-08:52:53:427 - INFO - PersonalAttributeList - get complex attributes
-08:52:53:427 - INFO - PersonalAttributeList - adding complex attribute:canonicalResidenceAddress
-08:52:53:498 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-08:52:53:518 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-08:52:53:518 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-08:52:53:518 - WARN - DateUtil - Invalid date format (yyyyMMdd) or an invalid dateValue.
-08:52:53:518 - WARN - DateUtil - Couldn't calculate Age, invalid date!
-08:52:53:518 - WARN - DateUtil - Couldn't calculate Age, invalid date!
diff --git a/id/server/stork2-saml-engine/.classpath b/id/server/stork2-saml-engine/.classpath
deleted file mode 100644
index d2bdee1ba..000000000
--- a/id/server/stork2-saml-engine/.classpath
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/id/server/stork2-saml-engine/.gitignore b/id/server/stork2-saml-engine/.gitignore
deleted file mode 100644
index ea8c4bf7f..000000000
--- a/id/server/stork2-saml-engine/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/id/server/stork2-saml-engine/.project b/id/server/stork2-saml-engine/.project
deleted file mode 100644
index 74b9c25ba..000000000
--- a/id/server/stork2-saml-engine/.project
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>SamlEngine</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-	</natures>
-</projectDescription>
diff --git a/id/server/stork2-saml-engine/.settings/org.eclipse.core.resources.prefs b/id/server/stork2-saml-engine/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index cdfe4f1b6..000000000
--- a/id/server/stork2-saml-engine/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/id/server/stork2-saml-engine/.settings/org.eclipse.jdt.core.prefs b/id/server/stork2-saml-engine/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 107056a36..000000000
--- a/id/server/stork2-saml-engine/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/id/server/stork2-saml-engine/.settings/org.eclipse.m2e.core.prefs b/id/server/stork2-saml-engine/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/id/server/stork2-saml-engine/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/id/server/stork2-saml-engine/.settings/org.eclipse.wst.common.component b/id/server/stork2-saml-engine/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 5ba2e3ad2..000000000
--- a/id/server/stork2-saml-engine/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="SamlEngine">
-        <wb-resource deploy-path="/" source-path="/src/main/java"/>
-    </wb-module>
-</project-modules>
diff --git a/id/server/stork2-saml-engine/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/stork2-saml-engine/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 5c9bd7532..000000000
--- a/id/server/stork2-saml-engine/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <installed facet="jst.utility" version="1.0"/>
-  <installed facet="java" version="1.6"/>
-</faceted-project>
diff --git a/id/server/stork2-saml-engine/.settings/org.eclipse.wst.validation.prefs b/id/server/stork2-saml-engine/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 04cad8cb7..000000000
--- a/id/server/stork2-saml-engine/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml
index ed5dfa973..5a6621f12 100644
--- a/id/server/stork2-saml-engine/pom.xml
+++ b/id/server/stork2-saml-engine/pom.xml
@@ -156,7 +156,7 @@
 		</pluginManagement>

 		<plugins>

 		

-<!-- 		           	 <plugin>

+		           	 <plugin>

             		<groupId>org.codehaus.mojo</groupId>

             		<artifactId>properties-maven-plugin</artifactId>

             		<version>1.0-alpha-2</version>

@@ -173,7 +173,7 @@
           		          </configuration>

               		  </execution>

             		</executions>

-        		</plugin> -->

+        		</plugin>

 		

 			<plugin>

 				<groupId>org.apache.maven.plugins</groupId>

diff --git a/moa-id.properties b/moa-id.properties
deleted file mode 100644
index 9c1c6b10d..000000000
--- a/moa-id.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-moa-spss-version=2.0.1
-
-moa-id-version=2.1.0-RC1
-configtool-version=1.1.0-RC1
-demo-oa-version=2.0.1
-
-  
diff --git a/pom.xml b/pom.xml
index 35b094538..63b547e51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
 

     <build>

         <plugins>

-<!--         		<plugin>

+        		<plugin>

             		<groupId>org.codehaus.mojo</groupId>

             		<artifactId>properties-maven-plugin</artifactId>

             		<version>1.0-alpha-2</version>

@@ -76,7 +76,7 @@
           		          </configuration>

               		  </execution>

             		</executions>

-        		</plugin> -->

+        		</plugin>

         		<plugin>

                 <groupId>org.apache.maven.plugins</groupId>

                 <artifactId>maven-surefire-plugin</artifactId>

diff --git a/spss/.project b/spss/.project
deleted file mode 100644
index df3314f06..000000000
--- a/spss/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>spss</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/spss/.settings/org.eclipse.core.resources.prefs b/spss/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c020..000000000
--- a/spss/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/spss/.settings/org.eclipse.m2e.core.prefs b/spss/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/spss/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/spss/handbook/.project b/spss/handbook/.project
deleted file mode 100644
index c8879a5c6..000000000
--- a/spss/handbook/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>moa-spss-handbook</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/spss/handbook/.settings/org.eclipse.core.resources.prefs b/spss/handbook/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c020..000000000
--- a/spss/handbook/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/spss/handbook/.settings/org.eclipse.jdt.core.prefs b/spss/handbook/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ddade97c6..000000000
--- a/spss/handbook/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Mon Aug 17 10:06:15 CEST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.source=1.4
diff --git a/spss/handbook/.settings/org.eclipse.m2e.core.prefs b/spss/handbook/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/spss/handbook/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/spss/handbook/.settings/org.maven.ide.eclipse.prefs b/spss/handbook/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index c0663df06..000000000
--- a/spss/handbook/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Tue Jul 07 16:06:52 CEST 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/spss/handbook/clients/.project b/spss/handbook/clients/.project
deleted file mode 100644
index 34bc10a51..000000000
--- a/spss/handbook/clients/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>moa-spss-handbook-clients</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/spss/handbook/clients/.settings/org.eclipse.core.resources.prefs b/spss/handbook/clients/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c020..000000000
--- a/spss/handbook/clients/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/spss/handbook/clients/.settings/org.eclipse.jdt.core.prefs b/spss/handbook/clients/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d15546cb7..000000000
--- a/spss/handbook/clients/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Tue Jul 07 16:07:23 CEST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.source=1.4
diff --git a/spss/handbook/clients/.settings/org.eclipse.m2e.core.prefs b/spss/handbook/clients/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/spss/handbook/clients/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/spss/handbook/clients/.settings/org.maven.ide.eclipse.prefs b/spss/handbook/clients/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index c0663df06..000000000
--- a/spss/handbook/clients/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Tue Jul 07 16:06:52 CEST 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/spss/handbook/clients/api/.classpath b/spss/handbook/clients/api/.classpath
deleted file mode 100644
index bc5aeac5e..000000000
--- a/spss/handbook/clients/api/.classpath
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/spss/handbook/clients/api/.gitignore b/spss/handbook/clients/api/.gitignore
deleted file mode 100644
index ea8c4bf7f..000000000
--- a/spss/handbook/clients/api/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/spss/handbook/clients/api/.project b/spss/handbook/clients/api/.project
deleted file mode 100644
index 3842561f1..000000000
--- a/spss/handbook/clients/api/.project
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>moa-spss-handbook-apiClient</name>
-	<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-	<projects>
-		<project>moa-common</project>
-		<project>moa-spss-lib</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-	</natures>
-</projectDescription>
diff --git a/spss/handbook/clients/api/.settings/org.eclipse.core.resources.prefs b/spss/handbook/clients/api/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index e9441bb12..000000000
--- a/spss/handbook/clients/api/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding/<project>=UTF-8
diff --git a/spss/handbook/clients/api/.settings/org.eclipse.jdt.core.prefs b/spss/handbook/clients/api/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 69c31cd49..000000000
--- a/spss/handbook/clients/api/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/spss/handbook/clients/api/.settings/org.eclipse.m2e.core.prefs b/spss/handbook/clients/api/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/spss/handbook/clients/api/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/spss/handbook/clients/api/.settings/org.maven.ide.eclipse.prefs b/spss/handbook/clients/api/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 1174e9cf1..000000000
--- a/spss/handbook/clients/api/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Tue Jul 07 16:06:54 CEST 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/spss/handbook/clients/api/bin/.gitignore b/spss/handbook/clients/api/bin/.gitignore
deleted file mode 100644
index ea8c4bf7f..000000000
--- a/spss/handbook/clients/api/bin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/spss/handbook/clients/api/bin/.project b/spss/handbook/clients/api/bin/.project
deleted file mode 100644
index 3842561f1..000000000
--- a/spss/handbook/clients/api/bin/.project
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>moa-spss-handbook-apiClient</name>
-	<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-	<projects>
-		<project>moa-common</project>
-		<project>moa-spss-lib</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-	</natures>
-</projectDescription>
diff --git a/spss/handbook/clients/api/bin/.settings/org.eclipse.jdt.core.prefs b/spss/handbook/clients/api/bin/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 56a71c783..000000000
--- a/spss/handbook/clients/api/bin/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Mon Aug 05 10:52:31 CEST 2013
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/spss/handbook/clients/api/bin/.settings/org.eclipse.m2e.core.prefs b/spss/handbook/clients/api/bin/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/spss/handbook/clients/api/bin/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/spss/handbook/clients/api/bin/.settings/org.maven.ide.eclipse.prefs b/spss/handbook/clients/api/bin/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 1174e9cf1..000000000
--- a/spss/handbook/clients/api/bin/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Tue Jul 07 16:06:54 CEST 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/spss/handbook/clients/api/bin/pom.xml b/spss/handbook/clients/api/bin/pom.xml
deleted file mode 100644
index 2d3da3df3..000000000
--- a/spss/handbook/clients/api/bin/pom.xml
+++ /dev/null
@@ -1,137 +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.handbook.clients</groupId>
-		<artifactId>moa-spss-handbook-clients</artifactId>
-		<version>2.0</version>
-	</parent>
-	
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>MOA.spss.handbook</groupId>
-	<artifactId>moa-spss-handbook-apiClient</artifactId>
-	<packaging>jar</packaging>
-	<version>2.0</version>
-	<name>MOA SP/SS Handbook API Client</name>
-
-	<properties>
-		<repositoryPath>${basedir}/../../../../../repository</repositoryPath>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>axis</groupId>
-			<artifactId>axis</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.axis</groupId>
-			<artifactId>axis-jaxrpc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.axis</groupId>
-			<artifactId>axis-saaj</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>axis</groupId>
-			<artifactId>axis-wsdl4j</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-discovery</groupId>
-			<artifactId>commons-discovery</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>activation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.mail</groupId>
-			<artifactId>mail</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>postgresql</groupId>
-			<artifactId>postgresql</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<!-- <scope>provided</scope>-->
-		</dependency>
-		<dependency>
-			<groupId>xalan-bin-dist</groupId>
-			<artifactId>xalan</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>xerces</groupId>
-			<artifactId>xercesImpl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>xalan-bin-dist</groupId>
-			<artifactId>xml-apis</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>xalan-bin-dist</groupId>
-			<artifactId>serializer</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_moa</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_ixsil</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_jce_full</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_ecc</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_cms</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_Pkcs11Wrapper</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_Pkcs11Wrapper</artifactId>
-			<classifier>win32</classifier>
-			<type>dll</type>
-			<scope>runtime</scope>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>MOA</groupId>
-			<artifactId>moa-common</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>MOA.spss.server</groupId>
-			<artifactId>moa-spss-lib</artifactId>
-		</dependency>
-	</dependencies>
-
-</project>
diff --git a/spss/handbook/clients/api/bin/signatures/SimpleSignature.xml b/spss/handbook/clients/api/bin/signatures/SimpleSignature.xml
deleted file mode 100644
index 9ecd215c1..000000000
--- a/spss/handbook/clients/api/bin/signatures/SimpleSignature.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#xpointer(id(&apos;signed-data-1-1-1&apos;)/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>tLODyeiWFbAkQKwhrR23jtcgu4k=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>VEjXB6+geUL16oTPDVx5lcQliGl/oyVobug3BVxVwhu8CU7WK65moTcTuo/CL2hQ</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="signed-data-1-1-1">Diese Daten werden signiert.</dsig:Object></dsig:Signature>
\ No newline at end of file
diff --git a/spss/handbook/clients/api/bin/src/main/java/at/gv/egovernment/moa/spss/handbook/clients/api/CreateXMLSignature.class b/spss/handbook/clients/api/bin/src/main/java/at/gv/egovernment/moa/spss/handbook/clients/api/CreateXMLSignature.class
deleted file mode 100644
index 472793a75..000000000
--- a/spss/handbook/clients/api/bin/src/main/java/at/gv/egovernment/moa/spss/handbook/clients/api/CreateXMLSignature.class
+++ /dev/null
diff --git a/spss/handbook/clients/api/bin/src/main/java/at/gv/egovernment/moa/spss/handbook/clients/api/VerifyXMLSignature.class b/spss/handbook/clients/api/bin/src/main/java/at/gv/egovernment/moa/spss/handbook/clients/api/VerifyXMLSignature.class
deleted file mode 100644
index 38a1a386e..000000000
--- a/spss/handbook/clients/api/bin/src/main/java/at/gv/egovernment/moa/spss/handbook/clients/api/VerifyXMLSignature.class
+++ /dev/null
diff --git a/spss/handbook/clients/api/pom.xml b/spss/handbook/clients/api/pom.xml
index da2101414..52a96c56b 100644
--- a/spss/handbook/clients/api/pom.xml
+++ b/spss/handbook/clients/api/pom.xml
@@ -9,6 +9,7 @@
 	<groupId>MOA.spss.handbook</groupId>

 	<artifactId>moa-spss-handbook-apiClient</artifactId>

 	<packaging>jar</packaging>

+	<version>2.0</version>

 	<name>MOA SP/SS Handbook API Client</name>

 

 	<properties>

@@ -134,7 +135,7 @@
 	</dependencies>

     <build>

         <plugins>

-<!--         		<plugin>

+        		<plugin>

             		<groupId>org.codehaus.mojo</groupId>

             		<artifactId>properties-maven-plugin</artifactId>

             		<version>1.0-alpha-2</version>

@@ -151,7 +152,7 @@
           		          </configuration>

               		  </execution>

             		</executions>

-        		</plugin> -->

+        		</plugin>

         	</plugins>

        </build>

 </project>

diff --git a/spss/handbook/clients/pom.xml b/spss/handbook/clients/pom.xml
index 1dfa3d532..70ae70a4b 100644
--- a/spss/handbook/clients/pom.xml
+++ b/spss/handbook/clients/pom.xml
@@ -10,6 +10,7 @@
   <groupId>MOA.spss.handbook.clients</groupId>

   <artifactId>moa-spss-handbook-clients</artifactId>

   <packaging>pom</packaging>

+  <version>2.0</version>

   <name>MOA SP/SS Handbook Clients</name>

 

   <modules>

@@ -23,7 +24,7 @@
   </properties>

       <build>

         <plugins>

-<!--         		<plugin>

+        		<plugin>

             		<groupId>org.codehaus.mojo</groupId>

             		<artifactId>properties-maven-plugin</artifactId>

             		<version>1.0-alpha-2</version>

@@ -40,7 +41,7 @@
           		          </configuration>

               		  </execution>

             		</executions>

-        		</plugin> -->

+        		</plugin>

         	</plugins>

        </build>

 </project>

diff --git a/spss/handbook/clients/referencedData/.classpath b/spss/handbook/clients/referencedData/.classpath
deleted file mode 100644
index 0cbbeaa3d..000000000
--- a/spss/handbook/clients/referencedData/.classpath
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/spss/handbook/clients/referencedData/.gitignore b/spss/handbook/clients/referencedData/.gitignore
deleted file mode 100644
index 934e0e06f..000000000
--- a/spss/handbook/clients/referencedData/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/bin
-/target
diff --git a/spss/handbook/clients/referencedData/.project b/spss/handbook/clients/referencedData/.project
deleted file mode 100644
index 433b32fa8..000000000
--- a/spss/handbook/clients/referencedData/.project
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>moa-spss-handbook-referencedData</name>
-	<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
-	</natures>
-</projectDescription>
diff --git a/spss/handbook/clients/referencedData/.settings/.jsdtscope b/spss/handbook/clients/referencedData/.settings/.jsdtscope
deleted file mode 100644
index bbb8e68be..000000000
--- a/spss/handbook/clients/referencedData/.settings/.jsdtscope
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
-		<attributes>
-			<attribute name="hide" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
-	<classpathentry kind="output" path=""/>
-</classpath>
diff --git a/spss/handbook/clients/referencedData/.settings/org.eclipse.core.resources.prefs b/spss/handbook/clients/referencedData/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c020..000000000
--- a/spss/handbook/clients/referencedData/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/spss/handbook/clients/referencedData/.settings/org.eclipse.jdt.core.prefs b/spss/handbook/clients/referencedData/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 69c31cd49..000000000
--- a/spss/handbook/clients/referencedData/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/spss/handbook/clients/referencedData/.settings/org.eclipse.m2e.core.prefs b/spss/handbook/clients/referencedData/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/spss/handbook/clients/referencedData/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.common.component b/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 664cf30ba..000000000
--- a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-  <wb-module deploy-name="moa-spss-handbook-referencedData">
-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-    <property name="java-output-path" value="/target/classes"/>
-        <property name="context-root" value="referencedData"/>
-  </wb-module>
-</project-modules>
diff --git a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.common.project.facet.core.xml b/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 463771365..000000000
--- a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="jst.java"/>
-  <fixed facet="jst.web"/>
-  <installed facet="jst.web" version="2.3"/>
-  <installed facet="jst.java" version="1.6"/>
-</faceted-project>
diff --git a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.jsdt.ui.superType.container b/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.jsdt.ui.superType.container
deleted file mode 100644
index 3bd5d0a48..000000000
--- a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.jsdt.ui.superType.name b/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.jsdt.ui.superType.name
deleted file mode 100644
index 05bd71b6e..000000000
--- a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ /dev/null
@@ -1 +0,0 @@
-Window
\ No newline at end of file
diff --git a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.validation.prefs b/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 04cad8cb7..000000000
--- a/spss/handbook/clients/referencedData/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
diff --git a/spss/handbook/clients/referencedData/.settings/org.maven.ide.eclipse.prefs b/spss/handbook/clients/referencedData/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 564125648..000000000
--- a/spss/handbook/clients/referencedData/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Tue Jul 07 16:06:53 CEST 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/spss/handbook/clients/referencedData/pom.xml b/spss/handbook/clients/referencedData/pom.xml
index e34df8ff5..65f8635de 100644
--- a/spss/handbook/clients/referencedData/pom.xml
+++ b/spss/handbook/clients/referencedData/pom.xml
@@ -10,6 +10,7 @@
   <groupId>MOA.spss.handbook</groupId>

   <artifactId>moa-spss-handbook-referencedData</artifactId>

   <packaging>war</packaging>

+  <version>2.0</version>

   <name>MOA SP/SS Handbook Referenced Data</name>

 

   <properties>

@@ -18,7 +19,7 @@
   

   <build>

     <plugins>

-<!--       <plugin>

+      <plugin>

         <groupId>org.apache.maven.plugins</groupId>

         <artifactId>maven-war-plugin</artifactId>

         <configuration>

@@ -31,7 +32,7 @@
             <addMavenDescriptor>false</addMavenDescriptor>

           </archive>

         </configuration>

-      </plugin> -->

+      </plugin>

 

         		<plugin>

             		<groupId>org.codehaus.mojo</groupId>

diff --git a/spss/handbook/clients/webservice/.classpath b/spss/handbook/clients/webservice/.classpath
deleted file mode 100644
index bc5aeac5e..000000000
--- a/spss/handbook/clients/webservice/.classpath
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/spss/handbook/clients/webservice/.gitignore b/spss/handbook/clients/webservice/.gitignore
deleted file mode 100644
index ea8c4bf7f..000000000
--- a/spss/handbook/clients/webservice/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/spss/handbook/clients/webservice/.project b/spss/handbook/clients/webservice/.project
deleted file mode 100644
index e03d32471..000000000
--- a/spss/handbook/clients/webservice/.project
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>moa-spss-handbook-webserviceClient</name>
-	<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-	<projects>
-		<project>moa-common</project>
-		<project>moa-spss-lib</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-	</natures>
-</projectDescription>
diff --git a/spss/handbook/clients/webservice/.settings/org.eclipse.core.resources.prefs b/spss/handbook/clients/webservice/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index e9441bb12..000000000
--- a/spss/handbook/clients/webservice/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding/<project>=UTF-8
diff --git a/spss/handbook/clients/webservice/.settings/org.eclipse.jdt.core.prefs b/spss/handbook/clients/webservice/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 69c31cd49..000000000
--- a/spss/handbook/clients/webservice/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/spss/handbook/clients/webservice/.settings/org.eclipse.m2e.core.prefs b/spss/handbook/clients/webservice/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/spss/handbook/clients/webservice/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/spss/handbook/clients/webservice/.settings/org.maven.ide.eclipse.prefs b/spss/handbook/clients/webservice/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 1174e9cf1..000000000
--- a/spss/handbook/clients/webservice/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Tue Jul 07 16:06:54 CEST 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/spss/handbook/clients/webservice/bin/.project b/spss/handbook/clients/webservice/bin/.project
deleted file mode 100644
index e03d32471..000000000
--- a/spss/handbook/clients/webservice/bin/.project
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>moa-spss-handbook-webserviceClient</name>
-	<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-	<projects>
-		<project>moa-common</project>
-		<project>moa-spss-lib</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-	</natures>
-</projectDescription>
diff --git a/spss/handbook/clients/webservice/bin/.settings/org.eclipse.jdt.core.prefs b/spss/handbook/clients/webservice/bin/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 56a71c783..000000000
--- a/spss/handbook/clients/webservice/bin/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Mon Aug 05 10:52:31 CEST 2013
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/spss/handbook/clients/webservice/bin/.settings/org.eclipse.m2e.core.prefs b/spss/handbook/clients/webservice/bin/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/spss/handbook/clients/webservice/bin/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/spss/handbook/clients/webservice/bin/.settings/org.maven.ide.eclipse.prefs b/spss/handbook/clients/webservice/bin/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 1174e9cf1..000000000
--- a/spss/handbook/clients/webservice/bin/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Tue Jul 07 16:06:54 CEST 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/spss/handbook/clients/webservice/bin/conf/http.properties b/spss/handbook/clients/webservice/bin/conf/http.properties
deleted file mode 100644
index 8bf490a85..000000000
--- a/spss/handbook/clients/webservice/bin/conf/http.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-###
-# Properties für den HTTP(S) Client
-###
-
-#
-# Signieren
-#
-
-# Name des Webservices, fix "SignatureCreation"
-signServiceQName = SignatureCreation
-
-# Zugangspunkt des Webservices
-signServiceEndPoint = http://localhost:8080/moa-spss/services/SignatureCreation
-#signServiceEndPoint = https://localhost:8443/moa-spss/services/SignatureCreation
-
-# Name des zu sendenden Signaturerstellungsrequests (entweder absolute
-# oder relative Pfadangabe; eine relative Pfadangabe wird relativ zum
-# Arbeitsverzeichnis der Java VM interpretiert)
-signRequest = resources/requests/CreateXMLSignatureRequest.Simple.xml
-#signRequest=resources/requests/CreateXMLSignatureRequest.Refs.xml
-#signRequest=resources/requests/CreateXMLSignatureRequest.Transforms.xml
-#signRequest=resources/requests/CreateXMLSignatureRequest.Supplements.xml
-
-
-#
-# Verifizieren
-#
-
-# Name des Webservices, fix "SignatureVerification"
-verifyServiceQName = SignatureVerification
-
-# Zugangspunkt des Webservices
-verifyServiceEndPoint = http://localhost:18080/moa-spss/services/SignatureVerification
-#verifyServiceEndPoint = https://localhost:8443/moa-spss/services/SignatureVerification
-
-# Name des zu sendenden Signaturprüfrequests (entweder absolute
-# oder relative Pfadangabe; eine relative Pfadangabe wird relativ zum
-# Arbeitsverzeichnis der Java VM interpretiert)
-verifyRequest=resources/requests/VerifyCMSSignatureRequest.Simple.xml
-#verifyRequest=resources/requests/VerifyCMSSignatureRequest.Extended.xml
-#verifyRequest=resources/requests/VerifyXMLSignatureRequest.Simple.xml
-#verifyRequest=resources/requests/VerifyXMLSignatureRequest.Enveloped.xml
-#verifyRequest=resources/requests/VerifyXMLSignatureRequest.Supplements.xml
-#verifyRequest=resources/requests/VerifyXMLSignatureRequest.SigManifest.xml
-#verifyRequest=resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.xml
-#verifyRequest=resources/requests/VerifyXMLSignatureRequest.FileURIs.xml
-#verifyRequest=resources/requests/VerifyXMLSignatureRequest.FileURIs.DataObject.xml
-#verifyRequest=resources/requests/VerifyXMLSignatureRequest.FileURIs.Supplements.xml
-#verifyRequest=resources/requests/VerifyXMLSignatureRequest.FileURIs.ServerSupplements.xml
-
-#
-# JSSE-Konfiguration
-#
-
-# Typ des JSSE-Truststores (entweder "JKS" für einen Java Key Store oder 
-# "PKCS12" für eine PKCS#12-Datei).
-ssl.truststore.type = JKS
-
-# Relativer oder absoluter Pfad zum JSSE-Truststore. Ein relativer Pfad 
-# wird relativ zum Arbeitsverzeichnis der Java VM interpretiert).
-ssl.truststore.loc = resources/sslKeys/customer1/trustedServers[pwd=servers].keystore
-#ssl.truststore.loc = resources/sslKeys/customer2/trustedServers[pwd=servers].keystore
-
-# Passwort für den JSSE-Truststore.
-ssl.truststore.pwd = servers
-
-# Typ des JSSE-Keystores (entweder "JKS" für einen Java Key Store oder 
-# "PKCS12" für eine PKCS#12-Datei).
-ssl.keystore.type = PKCS12
-
-# Relativer oder absoluter Pfad zum JSSE-Keystore. Ein relativer Pfad 
-# wird relativ zum Arbeitsverzeichnis der Java VM interpretiert).
-ssl.keystore.loc = resources/sslKeys/customer1/moa-ssl-kunde1[pwd=kunde1].p12
-#ssl.keystore.loc = resources/sslKeys/customer2/moa-ssl-kunde2[pwd=kunde2].p12
-
-# Passwort für den JSSE-Keystore.
-ssl.keystore.pwd = kunde1
-#ssl.keystore.pwd = kunde2
diff --git a/spss/handbook/clients/webservice/bin/conf/log4j.properties b/spss/handbook/clients/webservice/bin/conf/log4j.properties
deleted file mode 100644
index 346cc59f4..000000000
--- a/spss/handbook/clients/webservice/bin/conf/log4j.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# commons-logging setup
-org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory
-
-# define log4j root loggers
-log4j.rootLogger=info, stdout
-#log4j.rootLogger=info, stdout, R
-#log4j.logger.moa=info
-#log4j.logger.moa.spss.server=debug
-#log4j.logger.iaik.server=info
-#log4j.logger.moa.id.auth=debug
-#log4j.logger.moa.id.proxy=debug
-
-# configure the stdout appender
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %20.20c | %10t | %m%n
-
-# configure the rolling file appender (R)
-log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=${catalina.base}/logs/moa-id.log
-log4j.appender.R.MaxFileSize=10000KB
-log4j.appender.R.MaxBackupIndex=1
-log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %t | %m%n
-
diff --git a/spss/handbook/clients/webservice/bin/pom.xml b/spss/handbook/clients/webservice/bin/pom.xml
deleted file mode 100644
index cd42a9df8..000000000
--- a/spss/handbook/clients/webservice/bin/pom.xml
+++ /dev/null
@@ -1,136 +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.handbook.clients</groupId>
-		<artifactId>moa-spss-handbook-clients</artifactId>
-		<version>2.0</version>
-	</parent>
-	
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>MOA.spss.handbook.clients</groupId>
-	<artifactId>moa-spss-handbook-webserviceClient</artifactId>
-	<packaging>jar</packaging>
-	<version>2.0</version>
-	<name>MOA SP/SS Handbook WebService Client</name>
-	
-	<properties>
-		<repositoryPath>${basedir}/../../../../../repository</repositoryPath>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>axis</groupId>
-			<artifactId>axis</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.axis</groupId>
-			<artifactId>axis-jaxrpc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.axis</groupId>
-			<artifactId>axis-saaj</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>axis</groupId>
-			<artifactId>axis-wsdl4j</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-discovery</groupId>
-			<artifactId>commons-discovery</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>activation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.mail</groupId>
-			<artifactId>mail</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>postgresql</groupId>
-			<artifactId>postgresql</artifactId>
-		</dependency>
-		<dependency>		
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>xalan-bin-dist</groupId>
-			<artifactId>xalan</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>xerces</groupId>
-			<artifactId>xercesImpl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>xalan-bin-dist</groupId>
-			<artifactId>xml-apis</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>xalan-bin-dist</groupId>
-			<artifactId>serializer</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_moa</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_ixsil</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_jce_full</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_ecc</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_cms</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_Pkcs11Wrapper</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_Pkcs11Wrapper</artifactId>
-			<classifier>win32</classifier>
-			<type>dll</type>
-			<scope>runtime</scope>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>MOA</groupId>
-			<artifactId>moa-common</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>MOA.spss.server</groupId>
-			<artifactId>moa-spss-lib</artifactId>
-		</dependency>
-	</dependencies>
-
-</project>
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/CreateCMSSignatureRequest.Base64Content.resp.xml b/spss/handbook/clients/webservice/bin/resources/requests/CreateCMSSignatureRequest.Base64Content.resp.xml
deleted file mode 100644
index 45b06e48f..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/CreateCMSSignatureRequest.Base64Content.resp.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateCMSSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-         <CMSSignature>MIAGCSqGSIb3DQEHAqCAMIACAQExDTALBglghkgBZQMEAgMwgAYJKoZIhvcNAQcB
-oIAkgAQdRGllc2UgRGF0ZW4gc2luZCByZWluZXIgVGV4dC4AAAAAAACgggQvMIIE
-KzCCA5SgAwIBAgIGY6tXffAmMA0GCSqGSIb3DQEBBQUAMEAxIjAgBgNVBAMTGUlB
-SUsgVGVzdCBJbnRlcm1lZGlhdGUgQ0ExDTALBgNVBAoTBElBSUsxCzAJBgNVBAYT
-AkFUMB4XDTEzMDQxNjE0MzMyNFoXDTIzMDQxNjE0MzMyNFowfjELMAkGA1UEBhMC
-QVQxDTALBgNVBAcTBEdyYXoxJjAkBgNVBAoTHUdyYXogVW5pdmVyc2l0eSBvZiBU
-ZWNobm9sb2d5MQ0wCwYDVQQLEwRFR0laMSkwJwYDVQQDEyBUZXN0IFNpZ25hdHVy
-ZGllbnN0IGFsbGVyIEt1bmRlbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAN1oJenNIuGzCiny3kibTm1pYPfuCqbE+6x+skNXj+TRY0vsR+Skj5P1/sNl
-iFF0qVPrtH+VGvhzLBhb98uPEkxQ1xpl+AJ0YJin0XMW1+PMCGOuQ+A/mfsx9gZC
-lAMPffgCOBgEuAuugfl7NfW1+4wK8cy4OKUAl6/UuTKWhlZyh0HIsAVmvHquPsOa
-Fy607KI0JAK8QXogHu4nNXSRCuwf3YMM/lR1ky0Q90IBk4uBKE+2pPiIQAej6kiP
-a2HcbKNT9UCtmcUOtmaNPHhlGvjAAe6LBj7MfHjfHsvn3ub07w4hDG3NauaEiDcu
-cwjtOg9Bl6F8EcIzB8cmo25ZkrkCAwEAAaOCAWwwggFoMA4GA1UdDwEB/wQEAwIG
-wDAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBT5IDty8bqV51kzZB7+jExO+YOLUTBQ
-BgNVHR8ESTBHMEWgQ6BBhj9odHRwOi8vY2EuaWFpay50dWdyYXouYXQvY2Fwc28v
-Y3Jscy9JQUlLVGVzdF9JbnRlcm1lZGlhdGVDQS5jcmwwgaoGCCsGAQUFBwEBBIGd
-MIGaMEoGCCsGAQUFBzABhj5odHRwOi8vY2EuaWFpay50dWdyYXouYXQvY2Fwc28v
-T0NTUD9jYT1JQUlLVGVzdF9JbnRlcm1lZGlhdGVDQTBMBggrBgEFBQcwAoZAaHR0
-cDovL2NhLmlhaWsudHVncmF6LmF0L2NhcHNvL2NlcnRzL0lBSUtUZXN0X0ludGVy
-bWVkaWF0ZUNBLmNlcjAJBgNVHREEAjAAMB8GA1UdIwQYMBaAFGiiXhHa3i+Aa0RE
-v436ZTaBJKdvMA0GCSqGSIb3DQEBBQUAA4GBAGzwtp4nq0IxjnK5D86/9Gg6NRN2
-K39wN8/Zd6Uo8OnwmpYxEdfLsnDhp+H1IcqRFroqDRDmtoRXRqIW0VKJno70CzuW
-+3ZFsSopH51BbHSxIvXAbxfOPX1PZQ1fXGTo5gWaJ62Xeu6zi+YtSxQHNMHqUxO/
-llGVtT8VDtNGS0wGMYIC0TCCAs0CAQEwSjBAMSIwIAYDVQQDExlJQUlLIFRlc3Qg
-SW50ZXJtZWRpYXRlIENBMQ0wCwYDVQQKEwRJQUlLMQswCQYDVQQGEwJBVAIGY6tX
-ffAmMAsGCWCGSAFlAwQCA6CCAVwwFgYGBACNRQIBMQwMCnRleHQvcGxhaW4wGAYJ
-KoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMTMwNTE2MDkz
-MzUxWjBPBgkqhkiG9w0BCQQxQgRAds7061RkR9wybcxKrtd9Uc/S/DNyxhvXPzr5
-A8IphKGDTe4lHXiky2xwjYEcSE7Mx3Jm8Lo5d9iFu45Dq9nx0DCBuAYLKoZIhvcN
-AQkQAi8xgagwgaUwgaIwgZ8wCwYJYIZIAWUDBAIDBEBxEElsIgrSD8KgnZk88uom
-iqWEEvWoMufQe68l7z1/qYX39aLlD2ShpHolkI+EM5JuuWM678CAJdkOTvxUvKm8
-ME4wRKRCMEAxIjAgBgNVBAMTGUlBSUsgVGVzdCBJbnRlcm1lZGlhdGUgQ0ExDTAL
-BgNVBAoTBElBSUsxCzAJBgNVBAYTAkFUAgZjq1d98CYwCwYJKoZIhvcNAQEBBIIB
-AN0fuQCwuCxNQOGtR+Jv6lk/1QQkkxD7YUvbjGbJoaX+qpYmRFyw5dLo1y+1p4fR
-Sxyy0Zn2Yo8dD+5q/4LFtC4O1sz6qGZtmDMizwOuRcDQ0sn+nBQcDDWw81QKWqha
-g7VWOotssgq9Rt//YswBh/mx5B7yEx7RXdzvK9knPncyXnM5Yef7yrhJ65txJMSA
-hWUqikMC6NUn8N+ZCYyFlqyCWmbwpvBqXXb5OLt5Ke/lqKKG7iQrVwfTPBy0A7SA
-ZnOHW9RnKfC9lXfT0Qf9jVCsXaTznlLQS5FzUVQNmEJzWF7WAwYzVhRgmxWhbnp+
-V8aqyuBfKTs4gm0sQIxXoToAAAAAAAA=</CMSSignature>
-      </CreateCMSSignatureResponse>
-
-
-
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/CreateCMSSignatureRequest.Base64Content.xml b/spss/handbook/clients/webservice/bin/resources/requests/CreateCMSSignatureRequest.Base64Content.xml
deleted file mode 100644
index 28b67f94c..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/CreateCMSSignatureRequest.Base64Content.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateCMSSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-	<KeyIdentifier>KG_allgemein</KeyIdentifier>
-	<SingleSignatureInfo SecurityLayerConformity="true">
-		<DataObjectInfo Structure="enveloping">
-			<DataObject>
-				<MetaInfo>
-                	<MimeType>text/plain</MimeType>
-                </MetaInfo>
-                <Content>
-                	<Base64Content>RGllc2UgRGF0ZW4gc2luZCByZWluZXIgVGV4dC4=</Base64Content>
-                </Content>				
-			</DataObject>			
-		</DataObjectInfo>
-	</SingleSignatureInfo>
-</CreateCMSSignatureRequest>
-
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/CreateCMSSignatureRequest.Reference.resp.xml b/spss/handbook/clients/webservice/bin/resources/requests/CreateCMSSignatureRequest.Reference.resp.xml
deleted file mode 100644
index c81e98fee..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/CreateCMSSignatureRequest.Reference.resp.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateCMSSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-	<CMSSignature>MIAGCSqGSIb3DQEHAqCAMIACAQExDTALBglghkgBZQMEAgMwgAYJKoZIhvcNAQcB
-AACgggQvMIIEKzCCA5SgAwIBAgIGY6tXffAmMA0GCSqGSIb3DQEBBQUAMEAxIjAg
-BgNVBAMTGUlBSUsgVGVzdCBJbnRlcm1lZGlhdGUgQ0ExDTALBgNVBAoTBElBSUsx
-CzAJBgNVBAYTAkFUMB4XDTEzMDQxNjE0MzMyNFoXDTIzMDQxNjE0MzMyNFowfjEL
-MAkGA1UEBhMCQVQxDTALBgNVBAcTBEdyYXoxJjAkBgNVBAoTHUdyYXogVW5pdmVy
-c2l0eSBvZiBUZWNobm9sb2d5MQ0wCwYDVQQLEwRFR0laMSkwJwYDVQQDEyBUZXN0
-IFNpZ25hdHVyZGllbnN0IGFsbGVyIEt1bmRlbjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAN1oJenNIuGzCiny3kibTm1pYPfuCqbE+6x+skNXj+TRY0vs
-R+Skj5P1/sNliFF0qVPrtH+VGvhzLBhb98uPEkxQ1xpl+AJ0YJin0XMW1+PMCGOu
-Q+A/mfsx9gZClAMPffgCOBgEuAuugfl7NfW1+4wK8cy4OKUAl6/UuTKWhlZyh0HI
-sAVmvHquPsOaFy607KI0JAK8QXogHu4nNXSRCuwf3YMM/lR1ky0Q90IBk4uBKE+2
-pPiIQAej6kiPa2HcbKNT9UCtmcUOtmaNPHhlGvjAAe6LBj7MfHjfHsvn3ub07w4h
-DG3NauaEiDcucwjtOg9Bl6F8EcIzB8cmo25ZkrkCAwEAAaOCAWwwggFoMA4GA1Ud
-DwEB/wQEAwIGwDAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBT5IDty8bqV51kzZB7+
-jExO+YOLUTBQBgNVHR8ESTBHMEWgQ6BBhj9odHRwOi8vY2EuaWFpay50dWdyYXou
-YXQvY2Fwc28vY3Jscy9JQUlLVGVzdF9JbnRlcm1lZGlhdGVDQS5jcmwwgaoGCCsG
-AQUFBwEBBIGdMIGaMEoGCCsGAQUFBzABhj5odHRwOi8vY2EuaWFpay50dWdyYXou
-YXQvY2Fwc28vT0NTUD9jYT1JQUlLVGVzdF9JbnRlcm1lZGlhdGVDQTBMBggrBgEF
-BQcwAoZAaHR0cDovL2NhLmlhaWsudHVncmF6LmF0L2NhcHNvL2NlcnRzL0lBSUtU
-ZXN0X0ludGVybWVkaWF0ZUNBLmNlcjAJBgNVHREEAjAAMB8GA1UdIwQYMBaAFGii
-XhHa3i+Aa0REv436ZTaBJKdvMA0GCSqGSIb3DQEBBQUAA4GBAGzwtp4nq0IxjnK5
-D86/9Gg6NRN2K39wN8/Zd6Uo8OnwmpYxEdfLsnDhp+H1IcqRFroqDRDmtoRXRqIW
-0VKJno70CzuW+3ZFsSopH51BbHSxIvXAbxfOPX1PZQ1fXGTo5gWaJ62Xeu6zi+Yt
-SxQHNMHqUxO/llGVtT8VDtNGS0wGMYIB/TCCAfkCAQEwSjBAMSIwIAYDVQQDExlJ
-QUlLIFRlc3QgSW50ZXJtZWRpYXRlIENBMQ0wCwYDVQQKEwRJQUlLMQswCQYDVQQG
-EwJBVAIGY6tXffAmMAsGCWCGSAFlAwQCA6CBiTAYBgkqhkiG9w0BCQMxCwYJKoZI
-hvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0xMzA1MDYyMDE3NThaME8GCSqGSIb3DQEJ
-BDFCBEB2zvTrVGRH3DJtzEqu131Rz9L8M3LGG9c/OvkDwimEoYNN7iUdeKTLbHCN
-gRxITszHcmbwujl32IW7jkOr2fHQMAsGCSqGSIb3DQEBAQSCAQARQoV2xP8NRZpi
-PXk8554tQQ1EiT0EDbgbxtpPMlkTz4WODxcY+qpKC3ZM6uaOnTPfCwya/xucFC/u
-A2rvuvyuaoDDAPmvdmsFtNX0ymO3THECe95iJ3pd92m2DjfyEPS2S7hRkoSaMzqd
-BBLjwSGm8ZaM8J1Pd4hC6pKEdgMFB3VOgZFHOZd2fG60olI3wcYVvu1Rwkab5R9/
-kTsMHqDjLz0reHRK5G4RUAZ7NSZ+h7HWuaoTviaWPM37iUw4ipko5+vR6m3kxbUv
-p2mVhbGtiVjV6lwOfCA5kuFFjeaLrxLwv5JeVQItzw4E3DMEB2+csSA/qTH/xly4
-SwxhbA9pAAAAAAAA</CMSSignature>
-</CreateCMSSignatureResponse>
\ No newline at end of file
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/CreateCMSSignatureRequest.Reference.xml b/spss/handbook/clients/webservice/bin/resources/requests/CreateCMSSignatureRequest.Reference.xml
deleted file mode 100644
index 976ea7a6a..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/CreateCMSSignatureRequest.Reference.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateCMSSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-	<KeyIdentifier>KG_allgemein</KeyIdentifier>
-	<SingleSignatureInfo SecurityLayerConformity="false">
-		<DataObjectInfo Structure="detached">
-			<DataObject>
-				<MetaInfo>
-                	<MimeType>text/plain</MimeType>
-                </MetaInfo>
-                <Content Reference="http://localhost:8080/moa-spss-handbook-referencedData/Text.txt"/>
-			</DataObject>			
-		</DataObjectInfo>
-	</SingleSignatureInfo>
-</CreateCMSSignatureRequest>
\ No newline at end of file
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/CreateXMLSignatureRequest.Refs.resp.xml b/spss/handbook/clients/webservice/bin/resources/requests/CreateXMLSignatureRequest.Refs.resp.xml
deleted file mode 100644
index bad31d170..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/CreateXMLSignatureRequest.Refs.resp.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignatureEnvironment><doc:XMLDocument xmlns:doc="urn:document">
-  <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
-  <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-2" URI="#xpointer(id(&apos;signed-data-1-2-1&apos;)/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>A8ml6/aZKCmj1hONwvLItIwGHoc=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-3" URI="#xpointer(id(&apos;signed-data-1-3-1&apos;)/node())"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>0P878Dsmtxv5goj+6KgNmj6S/EE=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-4" URI="#xpointer(id(&apos;signed-data-1-4-1&apos;)/node())"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>0P878Dsmtxv5goj+6KgNmj6S/EE=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-6" URI="NichtAufloesbareReferenz1"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>2b83+NbXDFijHzz+sH0T7fM36sA=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-7" URI="http://localhost:8080/referencedData/Text.txt"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>0P878Dsmtxv5goj+6KgNmj6S/EE=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-8" URI="NichtAufloesbareReferenz2"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>0P878Dsmtxv5goj+6KgNmj6S/EE=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-9" URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>2b83+NbXDFijHzz+sH0T7fM36sA=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.w3.org/2000/09/xmldsig#Manifest" URI="#dsig-manifest-1-1"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>mNsxUkFoF46XZVBivBo4aasFCTQ=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>kaAiAZgnUMYb3/IV5mmJinrH3et5M+o4OWMhgA3C9SZSPsE+ptWUAPU1VKl1G2AF</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="signed-data-1-2-1"><doc:XMLDocument xmlns:doc="urn:document">
-  <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
-  <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph>
-</doc:XMLDocument></dsig:Object><dsig:Object Id="signed-data-1-3-1">RGllc2UgRGF0ZW4gc2luZCByZWluZXIgVGV4dC4=</dsig:Object><dsig:Object Id="signed-data-1-4-1">RGllc2UgRGF0ZW4gc2luZCByZWluZXIgVGV4dC4=</dsig:Object><dsig:Object Id="signed-data-1-1-1">RGllc2UgRGF0ZW4gd2FyZW4gYmFzZTY0IGtvZGllcnQu</dsig:Object><dsig:Object><dsig:Manifest Id="dsig-manifest-1-1"><dsig:Reference Id="reference-1-1" URI="#xpointer(id(&apos;signed-data-1-1-1&apos;)/node())"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>a53jOsL7KbyltpByAK87FoMZphI=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-5" URI="http://localhost:8080/referencedData/Text.b64"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>a53jOsL7KbyltpByAK87FoMZphI=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object></dsig:Signature>
-</doc:XMLDocument></SignatureEnvironment></CreateXMLSignatureResponse>
\ No newline at end of file
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/CreateXMLSignatureRequest.Refs.xml b/spss/handbook/clients/webservice/bin/resources/requests/CreateXMLSignatureRequest.Refs.xml
deleted file mode 100644
index f4dd2dbb6..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/CreateXMLSignatureRequest.Refs.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-  <KeyIdentifier>KG_allgemein</KeyIdentifier>
-  <SingleSignatureInfo SecurityLayerConformity="false">
-    <!--Enveloping Data, direkte Angabe der Daten in base64 kodierter Form; Manifest-Referenz-->
-    <DataObjectInfo Structure="enveloping" ChildOfManifest="true">
-      <DataObject>
-        <Base64Content>RGllc2UgRGF0ZW4gd2FyZW4gYmFzZTY0IGtvZGllcnQu</Base64Content>
-      </DataObject>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <FinalDataMetaInfo>
-            <MimeType>text/plain</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <!--Enveloping Data, direkte Angabe der Daten als XML-Fragment; SignedInfo-Referenz-->
-    <DataObjectInfo Structure="enveloping" ChildOfManifest="false">
-      <DataObject>
-        <XMLContent><doc:XMLDocument xmlns:doc="urn:document">
-  <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
-  <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph>
-</doc:XMLDocument></XMLContent>
-      </DataObject>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <FinalDataMetaInfo>
-            <MimeType>application/xml</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <!--Enveloping Data,  Angabe der Daten als Referenz mittels Reference-Attribut, die von MOA aufgelöst wird; SignedInfo-Referenz-->
-    <DataObjectInfo Structure="enveloping" ChildOfManifest="false">
-      <DataObject Reference="http://localhost:8080/referencedData/Text.txt"/>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <FinalDataMetaInfo>
-            <MimeType>text/plain</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <!--Enveloping Data,  Angabe der Daten als Referenz mittels LocRefContent, die von MOA aufgelöst wird; SignedInfo-Referenz-->
-    <DataObjectInfo Structure="enveloping" ChildOfManifest="false">
-      <DataObject>
-        <LocRefContent>http://localhost:8080/referencedData/Text.txt</LocRefContent>
-      </DataObject>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <FinalDataMetaInfo>
-            <MimeType>text/plain</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <!--Detached Daten; direkte Angabe der Daten in base64 kodierter Form; Referenzierung für die Signatur muss durch Reference-Attribut angegeben werden; Manifest-Referenz-->
-    <DataObjectInfo Structure="detached" ChildOfManifest="true">
-      <DataObject Reference="http://localhost:8080/referencedData/Text.b64">
-        <Base64Content>RGllc2UgRGF0ZW4gd2FyZW4gYmFzZTY0IGtvZGllcnQu</Base64Content>
-      </DataObject>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <FinalDataMetaInfo>
-            <MimeType>text/plain</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <!--Detached Daten; direkte Angabe der Daten als XML-Fragment; Referenzierung in der Signatur muss durch Reference-Attribut angegeben werden; SignedInfo-Referenz-->
-    <DataObjectInfo Structure="detached" ChildOfManifest="false">
-      <DataObject Reference="NichtAufloesbareReferenz1">
-        <XMLContent><doc:XMLDocument xmlns:doc="urn:document">
-  <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
-  <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph>
-</doc:XMLDocument></XMLContent>
-      </DataObject>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <FinalDataMetaInfo>
-            <MimeType>application/xml</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <!--Detached Daten;Angabe der Daten als Referenz über das Reference-Attribut, die von MOA aufgelöst wird; Referenzierung für die Signatur muss durch Reference-Attribut angegeben werden; SignedInfo-Referenz-->
-    <DataObjectInfo Structure="detached" ChildOfManifest="false">
-      <DataObject Reference="http://localhost:8080/referencedData/Text.txt">
-      </DataObject>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <FinalDataMetaInfo>
-            <MimeType>text/plain</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <!--Detached Daten;Angabe der Daten als Referenz mittels LocRefContent, die von MOA aufgelöst wird; Referenzierung für die Signatur muss durch Reference-Attribut angegeben werden; SignedInfo-Referenz-->
-    <DataObjectInfo Structure="detached" ChildOfManifest="false">
-      <DataObject Reference="NichtAufloesbareReferenz2">
-        <LocRefContent>http://localhost:8080/referencedData/Text.txt</LocRefContent>
-      </DataObject>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <FinalDataMetaInfo>
-            <MimeType>text/plain</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <!--Detached Daten, Verweis auf jenes Dokument, das die Signatur beinhalten wird; Angabe der Daten als Referenz über das Reference-Attribut, die von MOA aufgelöst wird; Referenzierung für die Signatur muss durch Reference-Attribut angegeben werden; SignedInfo-Referenz-->
-    <DataObjectInfo Structure="detached">
-      <DataObject Reference=""/>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <dsig:Transforms>
-            <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
-          </dsig:Transforms>
-          <FinalDataMetaInfo>
-            <MimeType>application/xml</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <CreateSignatureInfo>
-      <CreateSignatureEnvironment>
-        <LocRefContent>http://localhost:8080/referencedData/XMLDocument.xml</LocRefContent>
-      </CreateSignatureEnvironment>
-      <CreateSignatureEnvironmentProfile>
-        <CreateSignatureLocation Index="4" xmlns:doc="urn:document">/doc:XMLDocument</CreateSignatureLocation>
-      </CreateSignatureEnvironmentProfile>
-    </CreateSignatureInfo>
-  </SingleSignatureInfo>
-</CreateXMLSignatureRequest>
\ No newline at end of file
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/CreateXMLSignatureRequest.Simple.resp.xml b/spss/handbook/clients/webservice/bin/resources/requests/CreateXMLSignatureRequest.Simple.resp.xml
deleted file mode 100644
index edcb03c09..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/CreateXMLSignatureRequest.Simple.resp.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#xpointer(id(&apos;signed-data-1-1-1&apos;)/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>tLODyeiWFbAkQKwhrR23jtcgu4k=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>VEjXB6+geUL16oTPDVx5lcQliGl/oyVobug3BVxVwhu8CU7WK65moTcTuo/CL2hQ</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="signed-data-1-1-1">Diese Daten werden signiert.</dsig:Object></dsig:Signature></SignatureEnvironment></CreateXMLSignatureResponse>
\ No newline at end of file
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/CreateXMLSignatureRequest.Simple.xml b/spss/handbook/clients/webservice/bin/resources/requests/CreateXMLSignatureRequest.Simple.xml
deleted file mode 100644
index 3344b4709..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/CreateXMLSignatureRequest.Simple.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-	<KeyIdentifier>KG_allgemein</KeyIdentifier>
-	<SingleSignatureInfo SecurityLayerConformity="false">
-		<DataObjectInfo Structure="enveloping">
-			<DataObject>
-				<XMLContent>Diese Daten werden signiert.</XMLContent>
-			</DataObject>
-			<CreateTransformsInfoProfile>
-				<CreateTransformsInfo>
-					<FinalDataMetaInfo>
-						<MimeType>text/plain</MimeType>
-					</FinalDataMetaInfo>
-				</CreateTransformsInfo>
-			</CreateTransformsInfoProfile>
-		</DataObjectInfo>
-	</SingleSignatureInfo>
-</CreateXMLSignatureRequest>
-
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/CreateXMLSignatureRequest.Supplements.resp.xml b/spss/handbook/clients/webservice/bin/resources/requests/CreateXMLSignatureRequest.Supplements.resp.xml
deleted file mode 100644
index def0daf25..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/CreateXMLSignatureRequest.Supplements.resp.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignatureEnvironment><doc:XMLDocument xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:doc="urn:document" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:document urn:XMLDocument.xsd">
-  <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
-  <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#Para2"><dsig:Transforms><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">
-  <xsl:include href="XMLDocument.Para.xsl"/>
-</xsl:stylesheet></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>luM3wUmedTvkMHVedQkA/8otXUE=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>vGVimRmUHwrDR8feQCK1DZ2kyDw0CCrXimJi/yCrIoqSkUKFlKrtAyP2RUBXXjye</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo></dsig:Signature>
-</doc:XMLDocument></SignatureEnvironment></CreateXMLSignatureResponse>
\ No newline at end of file
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/CreateXMLSignatureRequest.Supplements.xml b/spss/handbook/clients/webservice/bin/resources/requests/CreateXMLSignatureRequest.Supplements.xml
deleted file mode 100644
index 9144e83f8..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/CreateXMLSignatureRequest.Supplements.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-  <KeyIdentifier>KG_allgemein</KeyIdentifier>
-  <SingleSignatureInfo SecurityLayerConformity="false">
-    <DataObjectInfo Structure="detached">
-      <DataObject Reference="#Para2"/>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <dsig:Transforms>
-            <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">
-  <xsl:include href="XMLDocument.Para.xsl"/>
-</xsl:stylesheet>              
-            </dsig:Transform>
-            <dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
-          </dsig:Transforms>
-          <FinalDataMetaInfo>
-            <MimeType>application/xhtml+xml</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-        <Supplement>
-          <Content Reference="XMLDocument.Para.xsl">
-            <LocRefContent>http://localhost:8080/referencedData/XMLDocument.Para.xsl</LocRefContent>
-          </Content>
-        </Supplement>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <CreateSignatureInfo>
-      <CreateSignatureEnvironment Reference="http://localhost:8080/referencedData/XMLDocument.withSchemaHint.xml"/>
-      <CreateSignatureEnvironmentProfile>
-        <CreateSignatureLocation Index="4" xmlns:doc="urn:document">/doc:XMLDocument</CreateSignatureLocation>
-        <Supplement>
-          <Content Reference="urn:XMLDocument.xsd">
-            <LocRefContent>http://localhost:8080/referencedData/XMLDocument.xsd</LocRefContent>
-          </Content>
-        </Supplement>
-      </CreateSignatureEnvironmentProfile>
-    </CreateSignatureInfo>
-  </SingleSignatureInfo>
-</CreateXMLSignatureRequest>
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/CreateXMLSignatureRequest.Transforms.resp.xml b/spss/handbook/clients/webservice/bin/resources/requests/CreateXMLSignatureRequest.Transforms.resp.xml
deleted file mode 100644
index 1d5bd65ea..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/CreateXMLSignatureRequest.Transforms.resp.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="http://localhost:8080/referencedData/Text.b64"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>a53jOsL7KbyltpByAK87FoMZphI=</dsig:DigestValue></dsig:Reference><dsig:Reference Id="reference-1-2" URI="http://localhost:8080/referencedData/XMLDocument.xml"><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2002/06/xmldsig-filter2"><xp2:XPath Filter="subtract" xmlns:doc="urn:document" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xf2="http://www.w3.org/2002/06/xmldsig-filter2" xmlns:xp2="http://www.w3.org/2002/06/xmldsig-filter2">/doc:XMLDocument/doc:Paragraph[2]</xp2:XPath></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116"><xsl:stylesheet version="1.0" xmlns:doc="urn:document" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output encoding="UTF-8" indent="yes" method="xml"/>
-  <xsl:template match="/doc:XMLDocument">
-    <html xmlns="http://www.w3.org/1999/xhtml">
-      <head>
-        <title>HTML-Dokument</title>
-      </head>
-      <body>
-        <xsl:for-each select="doc:Paragraph">
-          <p>
-            <xsl:value-of select="child::text()"/>
-          </p>
-        </xsl:for-each>
-      </body>
-    </html>
-  </xsl:template>
-</xsl:stylesheet></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>fIPwneCpjVqTXwHMN9DFfx6tJIU=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>kWm9iFL5UngH8uDG6094K99J/WB/PdlqzfI6WtGpJ3jiCTV7mn/mzYWMv09b3vee</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo></dsig:Signature></SignatureEnvironment></CreateXMLSignatureResponse>
\ No newline at end of file
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/CreateXMLSignatureRequest.Transforms.xml b/spss/handbook/clients/webservice/bin/resources/requests/CreateXMLSignatureRequest.Transforms.xml
deleted file mode 100644
index 6375365b2..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/CreateXMLSignatureRequest.Transforms.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-  <KeyIdentifier>KG_allgemein</KeyIdentifier>
-  <SingleSignatureInfo SecurityLayerConformity="false">
-    <DataObjectInfo Structure="detached">
-      <DataObject Reference="http://localhost:8080/referencedData/Text.b64"/>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <dsig:Transforms>
-            <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/>
-          </dsig:Transforms>
-          <FinalDataMetaInfo>
-            <MimeType>text/plain</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <DataObjectInfo Structure="detached">
-      <DataObject Reference="http://localhost:8080/referencedData/XMLDocument.xml"/>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <dsig:Transforms>
-            <dsig:Transform Algorithm="http://www.w3.org/2002/06/xmldsig-filter2">
-              <xp2:XPath xmlns:xp2="http://www.w3.org/2002/06/xmldsig-filter2" xmlns:doc="urn:document" Filter="subtract">/doc:XMLDocument/doc:Paragraph[2]</xp2:XPath>
-            </dsig:Transform>
-            <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:doc="urn:document">
-  <xsl:output encoding="UTF-8" method="xml" indent="yes"/>
-  <xsl:template match="/doc:XMLDocument">
-    <html xmlns="http://www.w3.org/1999/xhtml">
-      <head>
-        <title>HTML-Dokument</title>
-      </head>
-      <body>
-        <xsl:for-each select="doc:Paragraph">
-          <p>
-            <xsl:value-of select="child::text()"/>
-          </p>
-        </xsl:for-each>
-      </body>
-    </html>
-  </xsl:template>
-</xsl:stylesheet></dsig:Transform>
-            <dsig:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
-          </dsig:Transforms>
-          <FinalDataMetaInfo>
-            <MimeType>application/xhtml+xml</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-  </SingleSignatureInfo>
-</CreateXMLSignatureRequest>
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/VerifyCMSSignatureRequest.Extended.resp.xml b/spss/handbook/clients/webservice/bin/resources/requests/VerifyCMSSignatureRequest.Extended.resp.xml
deleted file mode 100644
index daa22bdb3..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/VerifyCMSSignatureRequest.Extended.resp.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyCMSSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignerInfo><dsig:X509Data><dsig:X509SubjectName>serialNumber=615536615920,givenName=Gregor,SN=Karlinger,CN=Gregor Karlinger,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=TrustSignTest-Sig-01,OU=TrustSignTest-Sig-01,O=A-Trust Ges. für Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>2892</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIFLjCCBBagAwIBAgICC0wwDQYJKoZIhvcNAQEFBQAwgdkxCzAJBgNVBAYTAkFU
-MYGLMIGIBgNVBAoegYAAQQAtAFQAcgB1AHMAdAAgAEcAZQBzAC4AIABmAPwAcgAg
-AFMAaQBjAGgAZQByAGgAZQBpAHQAcwBzAHkAcwB0AGUAbQBlACAAaQBtACAAZQBs
-AGUAawB0AHIALgAgAEQAYQB0AGUAbgB2AGUAcgBrAGUAaAByACAARwBtAGIASDEd
-MBsGA1UECxMUVHJ1c3RTaWduVGVzdC1TaWctMDExHTAbBgNVBAMTFFRydXN0U2ln
-blRlc3QtU2lnLTAxMB4XDTAzMDgyNzEyMDEyNFoXDTA2MDgyNzEyMDEyNFowZDEL
-MAkGA1UEBhMCQVQxGTAXBgNVBAMTEEdyZWdvciBLYXJsaW5nZXIxEjAQBgNVBAQT
-CUthcmxpbmdlcjEPMA0GA1UEKhMGR3JlZ29yMRUwEwYDVQQFEww2MTU1MzY2MTU5
-MjAwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKDSK1XaYK0Ydbk6V58g7QzQ
-Ysk0A6C2JyhiZy3078DJ1EkwzBMVejTNq1e9wp+BmeZ2YpiftNyRFfu/Gg8ksOUQ
-2oCn9A9pZLUGvtajA3aL8f182GQODRqQmelvYSUL/u9vAChOlcT+UEqj5jW4xjd4
-XsCotX4Kz+ofkD+SAlf1AgMBAAGjggH2MIIB8jATBgNVHSMEDDAKgAhKfsjmnWR0
-6TA+BggrBgEFBQcBAwEB/wQvMC0wCAYGBACORgEBMBUGBgQAjkYBAjALEwNFVVIC
-AQACAQAwCgYIKwYBBQUHCwEwgYIGCCsGAQUFBwEBBHYwdDAvBggrBgEFBQcwAYYj
-aHR0cDovL29jc3AtdGVzdC5hLXRydXN0LmF0OjgyL29jc3AwQQYIKwYBBQUHMAKG
-NWh0dHA6Ly93d3cuYS10cnVzdC5hdC9jZXJ0cy9UcnVzdFNpZ25UZXN0LVNpZy0w
-MWMuY3J0MFEGA1UdIARKMEgwPAYGKigAEQEDMDIwMAYIKwYBBQUHAgEWJGh0dHA6
-Ly93d3cuYS10cnVzdC5hdC9kb2NzL1RydXN0VGVzdDAIBgYEAIswAQEwbgYDVR0f
-BGcwZTBjoGGgX4ZdbGRhcDovL2xkYXAtdGVzdC5hLXRydXN0LmF0L291PVRydXN0
-U2lnblRlc3QtU2lnLTAxLG89QS1UcnVzdCxjPUFUP2NlcnRpZmljYXRlcmV2b2Nh
-dGlvbmxpc3Q/MBEGA1UdDgQKBAhNa9QR1H4T3zAOBgNVHQ8BAf8EBAMCBsAwJQYD
-VR0RBB4wHIEaZ3JlZ29yLmthcmxpbmdlckBjaW8uZ3YuYXQwCQYDVR0TBAIwADAN
-BgkqhkiG9w0BAQUFAAOCAQEALi2DEl6whJsiQF+bsNVR8CQhXg6ZuzTGlPhyCBum
-765Y5gMRLEfAx2D8Wv4XXPHasAxZ/NKZRwbfLWN7IxPeVHF+vCShlXmYGWVj75fE
-EGStIKyULqZB7jOJdsFHNdvp8yQaexR9olO3neXjrFmcXFVhpZFJomBH6JEL0uRa
-LsPlN97OTa1NKkdj92SX8IkcV2k9yQ3Nl2KgicZDlxdYtSDGh9P0KddJZZJTRAdm
-ixWb4Y2cGkRDhXoHzvHcZQ7eqJYHPapm3NTZ428I7LCKma8859rMwRSNTN14yIVL
-KkgBtxvmstGVa33Ki53LBkSSuBMH3Pa+4xbnYSkJA4phaA==</dsig:X509Certificate><QualifiedCertificate/></dsig:X509Data></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>1</Code></CertificateCheck></VerifyCMSSignatureResponse>
\ No newline at end of file
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/VerifyCMSSignatureRequest.Extended.xml b/spss/handbook/clients/webservice/bin/resources/requests/VerifyCMSSignatureRequest.Extended.xml
deleted file mode 100644
index 16e961b96..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/VerifyCMSSignatureRequest.Extended.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyCMSSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" Signatories="1">
-  <DateTime>2004-08-17T08:00:00+02:00</DateTime>
-  <CMSSignature>MIIHiwYJKoZIhvcNAQcCoIIHfDCCB3gCAQExCzAJBgUrDgMCGgUAMAsGCSqGSIb3DQEHAaCCBTIw
-ggUuMIIEFqADAgECAgILTDANBgkqhkiG9w0BAQUFADCB2TELMAkGA1UEBhMCQVQxgYswgYgGA1UE
-Ch6BgABBAC0AVAByAHUAcwB0ACAARwBlAHMALgAgAGYA/AByACAAUwBpAGMAaABlAHIAaABlAGkA
-dABzAHMAeQBzAHQAZQBtAGUAIABpAG0AIABlAGwAZQBrAHQAcgAuACAARABhAHQAZQBuAHYAZQBy
-AGsAZQBoAHIAIABHAG0AYgBIMR0wGwYDVQQLExRUcnVzdFNpZ25UZXN0LVNpZy0wMTEdMBsGA1UE
-AxMUVHJ1c3RTaWduVGVzdC1TaWctMDEwHhcNMDMwODI3MTIwMTI0WhcNMDYwODI3MTIwMTI0WjBk
-MQswCQYDVQQGEwJBVDEZMBcGA1UEAxMQR3JlZ29yIEthcmxpbmdlcjESMBAGA1UEBBMJS2FybGlu
-Z2VyMQ8wDQYDVQQqEwZHcmVnb3IxFTATBgNVBAUTDDYxNTUzNjYxNTkyMDCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAoNIrVdpgrRh1uTpXnyDtDNBiyTQDoLYnKGJnLfTvwMnUSTDMExV6NM2r
-V73Cn4GZ5nZimJ+03JEV+78aDySw5RDagKf0D2lktQa+1qMDdovx/XzYZA4NGpCZ6W9hJQv+728A
-KE6VxP5QSqPmNbjGN3hewKi1fgrP6h+QP5ICV/UCAwEAAaOCAfYwggHyMBMGA1UdIwQMMAqACEp+
-yOadZHTpMD4GCCsGAQUFBwEDAQH/BC8wLTAIBgYEAI5GAQEwFQYGBACORgECMAsTA0VVUgIBAAIB
-ADAKBggrBgEFBQcLATCBggYIKwYBBQUHAQEEdjB0MC8GCCsGAQUFBzABhiNodHRwOi8vb2NzcC10
-ZXN0LmEtdHJ1c3QuYXQ6ODIvb2NzcDBBBggrBgEFBQcwAoY1aHR0cDovL3d3dy5hLXRydXN0LmF0
-L2NlcnRzL1RydXN0U2lnblRlc3QtU2lnLTAxYy5jcnQwUQYDVR0gBEowSDA8BgYqKAARAQMwMjAw
-BggrBgEFBQcCARYkaHR0cDovL3d3dy5hLXRydXN0LmF0L2RvY3MvVHJ1c3RUZXN0MAgGBgQAizAB
-ATBuBgNVHR8EZzBlMGOgYaBfhl1sZGFwOi8vbGRhcC10ZXN0LmEtdHJ1c3QuYXQvb3U9VHJ1c3RT
-aWduVGVzdC1TaWctMDEsbz1BLVRydXN0LGM9QVQ/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdD8w
-EQYDVR0OBAoECE1r1BHUfhPfMA4GA1UdDwEB/wQEAwIGwDAlBgNVHREEHjAcgRpncmVnb3Iua2Fy
-bGluZ2VyQGNpby5ndi5hdDAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBBQUAA4IBAQAuLYMSXrCEmyJA
-X5uw1VHwJCFeDpm7NMaU+HIIG6bvrljmAxEsR8DHYPxa/hdc8dqwDFn80plHBt8tY3sjE95UcX68
-JKGVeZgZZWPvl8QQZK0grJQupkHuM4l2wUc12+nzJBp7FH2iU7ed5eOsWZxcVWGlkUmiYEfokQvS
-5Fouw+U33s5NrU0qR2P3ZJfwiRxXaT3JDc2XYqCJxkOXF1i1IMaH0/Qp10llklNEB2aLFZvhjZwa
-REOFegfO8dxlDt6olgc9qmbc1NnjbwjssIqZrzzn2szBFI1M3XjIhUsqSAG3G+ay0ZVrfcqLncsG
-RJK4Ewfc9r7jFudhKQkDimFoMYICITCCAh0CAQEwgeAwgdkxCzAJBgNVBAYTAkFUMYGLMIGIBgNV
-BAoegYAAQQAtAFQAcgB1AHMAdAAgAEcAZQBzAC4AIABmAPwAcgAgAFMAaQBjAGgAZQByAGgAZQBp
-AHQAcwBzAHkAcwB0AGUAbQBlACAAaQBtACAAZQBsAGUAawB0AHIALgAgAEQAYQB0AGUAbgB2AGUA
-cgBrAGUAaAByACAARwBtAGIASDEdMBsGA1UECxMUVHJ1c3RTaWduVGVzdC1TaWctMDExHTAbBgNV
-BAMTFFRydXN0U2lnblRlc3QtU2lnLTAxAgILTDAJBgUrDgMCGgUAoIGXMCMGCSqGSIb3DQEJBDEW
-BBRrneM6wvspvKW2kHIArzsWgxmmEjAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMCkGCyqGSIb3
-DQEJEAIEMRowGAwLdGV4dC9wbGFpbhsGCSqGSIb3DQEHATArBgsqhkiG9w0BCRACEzEcMBowGDAW
-BBQdhdZ+dQSz53K2vT9KOGCxp6+qIDANBgkqhkiG9w0BAQEFAASBgFTEY4mMXQx2fNk9zo64MRxI
-mS38vuD7W7LjBoUQ/w6mPi60kiqA/Pnf5I7fvM2epuo4xHpft1diuTY0fa9VqSv+q13Lr1x+l3ON
-oxX27oCPLcJq6sFipZj50Bx5BHhgTX+59cNIT3eTRLenBzrJ/ccNd5OLqgkfiwsvqSk48lou</CMSSignature>
-  <DataObject>
-    <Content>
-      <Base64Content>RGllc2UgRGF0ZW4gd2FyZW4gYmFzZTY0IGtvZGllcnQu</Base64Content>
-    </Content>
-  </DataObject>
-  <TrustProfileID>Test-Signaturdienste</TrustProfileID>
-</VerifyCMSSignatureRequest>
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/VerifyCMSSignatureRequest.Simple.resp.xml b/spss/handbook/clients/webservice/bin/resources/requests/VerifyCMSSignatureRequest.Simple.resp.xml
deleted file mode 100644
index daa22bdb3..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/VerifyCMSSignatureRequest.Simple.resp.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyCMSSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignerInfo><dsig:X509Data><dsig:X509SubjectName>serialNumber=615536615920,givenName=Gregor,SN=Karlinger,CN=Gregor Karlinger,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=TrustSignTest-Sig-01,OU=TrustSignTest-Sig-01,O=A-Trust Ges. für Sicherheitssysteme im elektr. Datenverkehr GmbH,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>2892</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIIFLjCCBBagAwIBAgICC0wwDQYJKoZIhvcNAQEFBQAwgdkxCzAJBgNVBAYTAkFU
-MYGLMIGIBgNVBAoegYAAQQAtAFQAcgB1AHMAdAAgAEcAZQBzAC4AIABmAPwAcgAg
-AFMAaQBjAGgAZQByAGgAZQBpAHQAcwBzAHkAcwB0AGUAbQBlACAAaQBtACAAZQBs
-AGUAawB0AHIALgAgAEQAYQB0AGUAbgB2AGUAcgBrAGUAaAByACAARwBtAGIASDEd
-MBsGA1UECxMUVHJ1c3RTaWduVGVzdC1TaWctMDExHTAbBgNVBAMTFFRydXN0U2ln
-blRlc3QtU2lnLTAxMB4XDTAzMDgyNzEyMDEyNFoXDTA2MDgyNzEyMDEyNFowZDEL
-MAkGA1UEBhMCQVQxGTAXBgNVBAMTEEdyZWdvciBLYXJsaW5nZXIxEjAQBgNVBAQT
-CUthcmxpbmdlcjEPMA0GA1UEKhMGR3JlZ29yMRUwEwYDVQQFEww2MTU1MzY2MTU5
-MjAwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKDSK1XaYK0Ydbk6V58g7QzQ
-Ysk0A6C2JyhiZy3078DJ1EkwzBMVejTNq1e9wp+BmeZ2YpiftNyRFfu/Gg8ksOUQ
-2oCn9A9pZLUGvtajA3aL8f182GQODRqQmelvYSUL/u9vAChOlcT+UEqj5jW4xjd4
-XsCotX4Kz+ofkD+SAlf1AgMBAAGjggH2MIIB8jATBgNVHSMEDDAKgAhKfsjmnWR0
-6TA+BggrBgEFBQcBAwEB/wQvMC0wCAYGBACORgEBMBUGBgQAjkYBAjALEwNFVVIC
-AQACAQAwCgYIKwYBBQUHCwEwgYIGCCsGAQUFBwEBBHYwdDAvBggrBgEFBQcwAYYj
-aHR0cDovL29jc3AtdGVzdC5hLXRydXN0LmF0OjgyL29jc3AwQQYIKwYBBQUHMAKG
-NWh0dHA6Ly93d3cuYS10cnVzdC5hdC9jZXJ0cy9UcnVzdFNpZ25UZXN0LVNpZy0w
-MWMuY3J0MFEGA1UdIARKMEgwPAYGKigAEQEDMDIwMAYIKwYBBQUHAgEWJGh0dHA6
-Ly93d3cuYS10cnVzdC5hdC9kb2NzL1RydXN0VGVzdDAIBgYEAIswAQEwbgYDVR0f
-BGcwZTBjoGGgX4ZdbGRhcDovL2xkYXAtdGVzdC5hLXRydXN0LmF0L291PVRydXN0
-U2lnblRlc3QtU2lnLTAxLG89QS1UcnVzdCxjPUFUP2NlcnRpZmljYXRlcmV2b2Nh
-dGlvbmxpc3Q/MBEGA1UdDgQKBAhNa9QR1H4T3zAOBgNVHQ8BAf8EBAMCBsAwJQYD
-VR0RBB4wHIEaZ3JlZ29yLmthcmxpbmdlckBjaW8uZ3YuYXQwCQYDVR0TBAIwADAN
-BgkqhkiG9w0BAQUFAAOCAQEALi2DEl6whJsiQF+bsNVR8CQhXg6ZuzTGlPhyCBum
-765Y5gMRLEfAx2D8Wv4XXPHasAxZ/NKZRwbfLWN7IxPeVHF+vCShlXmYGWVj75fE
-EGStIKyULqZB7jOJdsFHNdvp8yQaexR9olO3neXjrFmcXFVhpZFJomBH6JEL0uRa
-LsPlN97OTa1NKkdj92SX8IkcV2k9yQ3Nl2KgicZDlxdYtSDGh9P0KddJZZJTRAdm
-ixWb4Y2cGkRDhXoHzvHcZQ7eqJYHPapm3NTZ428I7LCKma8859rMwRSNTN14yIVL
-KkgBtxvmstGVa33Ki53LBkSSuBMH3Pa+4xbnYSkJA4phaA==</dsig:X509Certificate><QualifiedCertificate/></dsig:X509Data></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>1</Code></CertificateCheck></VerifyCMSSignatureResponse>
\ No newline at end of file
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/VerifyCMSSignatureRequest.Simple.xml b/spss/handbook/clients/webservice/bin/resources/requests/VerifyCMSSignatureRequest.Simple.xml
deleted file mode 100644
index d41b0e278..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/VerifyCMSSignatureRequest.Simple.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyCMSSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
-  <CMSSignature>MIIHsAYJKoZIhvcNAQcCoIIHoTCCB50CAQExCzAJBgUrDgMCGgUAMDAGCSqGSIb3DQEHAaAjBCFE
-aWVzZSBEYXRlbiB3YXJlbiBiYXNlNjQga29kaWVydC6gggUyMIIFLjCCBBagAwIBAgICC0wwDQYJ
-KoZIhvcNAQEFBQAwgdkxCzAJBgNVBAYTAkFUMYGLMIGIBgNVBAoegYAAQQAtAFQAcgB1AHMAdAAg
-AEcAZQBzAC4AIABmAPwAcgAgAFMAaQBjAGgAZQByAGgAZQBpAHQAcwBzAHkAcwB0AGUAbQBlACAA
-aQBtACAAZQBsAGUAawB0AHIALgAgAEQAYQB0AGUAbgB2AGUAcgBrAGUAaAByACAARwBtAGIASDEd
-MBsGA1UECxMUVHJ1c3RTaWduVGVzdC1TaWctMDExHTAbBgNVBAMTFFRydXN0U2lnblRlc3QtU2ln
-LTAxMB4XDTAzMDgyNzEyMDEyNFoXDTA2MDgyNzEyMDEyNFowZDELMAkGA1UEBhMCQVQxGTAXBgNV
-BAMTEEdyZWdvciBLYXJsaW5nZXIxEjAQBgNVBAQTCUthcmxpbmdlcjEPMA0GA1UEKhMGR3JlZ29y
-MRUwEwYDVQQFEww2MTU1MzY2MTU5MjAwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKDSK1Xa
-YK0Ydbk6V58g7QzQYsk0A6C2JyhiZy3078DJ1EkwzBMVejTNq1e9wp+BmeZ2YpiftNyRFfu/Gg8k
-sOUQ2oCn9A9pZLUGvtajA3aL8f182GQODRqQmelvYSUL/u9vAChOlcT+UEqj5jW4xjd4XsCotX4K
-z+ofkD+SAlf1AgMBAAGjggH2MIIB8jATBgNVHSMEDDAKgAhKfsjmnWR06TA+BggrBgEFBQcBAwEB
-/wQvMC0wCAYGBACORgEBMBUGBgQAjkYBAjALEwNFVVICAQACAQAwCgYIKwYBBQUHCwEwgYIGCCsG
-AQUFBwEBBHYwdDAvBggrBgEFBQcwAYYjaHR0cDovL29jc3AtdGVzdC5hLXRydXN0LmF0OjgyL29j
-c3AwQQYIKwYBBQUHMAKGNWh0dHA6Ly93d3cuYS10cnVzdC5hdC9jZXJ0cy9UcnVzdFNpZ25UZXN0
-LVNpZy0wMWMuY3J0MFEGA1UdIARKMEgwPAYGKigAEQEDMDIwMAYIKwYBBQUHAgEWJGh0dHA6Ly93
-d3cuYS10cnVzdC5hdC9kb2NzL1RydXN0VGVzdDAIBgYEAIswAQEwbgYDVR0fBGcwZTBjoGGgX4Zd
-bGRhcDovL2xkYXAtdGVzdC5hLXRydXN0LmF0L291PVRydXN0U2lnblRlc3QtU2lnLTAxLG89QS1U
-cnVzdCxjPUFUP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3Q/MBEGA1UdDgQKBAhNa9QR1H4T3zAO
-BgNVHQ8BAf8EBAMCBsAwJQYDVR0RBB4wHIEaZ3JlZ29yLmthcmxpbmdlckBjaW8uZ3YuYXQwCQYD
-VR0TBAIwADANBgkqhkiG9w0BAQUFAAOCAQEALi2DEl6whJsiQF+bsNVR8CQhXg6ZuzTGlPhyCBum
-765Y5gMRLEfAx2D8Wv4XXPHasAxZ/NKZRwbfLWN7IxPeVHF+vCShlXmYGWVj75fEEGStIKyULqZB
-7jOJdsFHNdvp8yQaexR9olO3neXjrFmcXFVhpZFJomBH6JEL0uRaLsPlN97OTa1NKkdj92SX8Ikc
-V2k9yQ3Nl2KgicZDlxdYtSDGh9P0KddJZZJTRAdmixWb4Y2cGkRDhXoHzvHcZQ7eqJYHPapm3NTZ
-428I7LCKma8859rMwRSNTN14yIVLKkgBtxvmstGVa33Ki53LBkSSuBMH3Pa+4xbnYSkJA4phaDGC
-AiEwggIdAgEBMIHgMIHZMQswCQYDVQQGEwJBVDGBizCBiAYDVQQKHoGAAEEALQBUAHIAdQBzAHQA
-IABHAGUAcwAuACAAZgD8AHIAIABTAGkAYwBoAGUAcgBoAGUAaQB0AHMAcwB5AHMAdABlAG0AZQAg
-AGkAbQAgAGUAbABlAGsAdAByAC4AIABEAGEAdABlAG4AdgBlAHIAawBlAGgAcgAgAEcAbQBiAEgx
-HTAbBgNVBAsTFFRydXN0U2lnblRlc3QtU2lnLTAxMR0wGwYDVQQDExRUcnVzdFNpZ25UZXN0LVNp
-Zy0wMQICC0wwCQYFKw4DAhoFAKCBlzAjBgkqhkiG9w0BCQQxFgQUa53jOsL7KbyltpByAK87FoMZ
-phIwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATApBgsqhkiG9w0BCRACBDEaMBgMC3RleHQvcGxh
-aW4bBgkqhkiG9w0BBwEwKwYLKoZIhvcNAQkQAhMxHDAaMBgwFgQUHYXWfnUEs+dytr0/Sjhgsaev
-qiAwDQYJKoZIhvcNAQEBBQAEgYBUxGOJjF0MdnzZPc6OuDEcSJkt/L7g+1uy4waFEP8Opj4utJIq
-gPz53+SO37zNnqbqOMR6X7dXYrk2NH2vVakr/qtdy69cfpdzjaMV9u6Ajy3CaurBYqWY+dAceQR4
-YE1/ufXDSE93k0S3pwc6yf3HDXeTi6oJH4sLL6kpOPJaLg==</CMSSignature>
-  <TrustProfileID>Test-Signaturdienste</TrustProfileID>
-</VerifyCMSSignatureRequest>
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.Enveloped.resp.xml b/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.Enveloped.resp.xml
deleted file mode 100644
index f4db026fe..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.Enveloped.resp.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignerInfo><dsig:X509Data><dsig:X509SubjectName>CN=Test: Signaturdienst aller Kunden: ECDSA (P192v1),OU=Technik und Standards,O=Stabsstelle IKT-Strategie des Bundes,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate><PublicAuthority><Code>BKA-IKT</Code></PublicAuthority></dsig:X509Data></SignerInfo><HashInputData PartOf="SignedInfo"><Base64Content>PGRvYzpYTUxEb2N1bWVudCB4bWxuczpkb2M9InVybjpkb2N1bWVudCI+CiAgPGRv
-YzpQYXJhZ3JhcGg+SWNoIGJpbiBkZXIgZXJzdGUgQWJzYXR6IGluIGRpZXNlbSBE
-b2t1bWVudC48L2RvYzpQYXJhZ3JhcGg+CiAgPGRvYzpQYXJhZ3JhcGggUGFyYUlk
-PSJQYXJhMiI+VW5kIGljaCBiaW4gZGVyIHp3ZWl0ZSBBYnNhdHogaW4gZGllc2Vt
-IERva3VtZW50LgpJY2ggaGFiZSB3ZWl0ZXJzIGVpbiBlaWdlbmVucyBJRC1BdHRy
-aWJ1dCBiZWtvbW1lbi48L2RvYzpQYXJhZ3JhcGg+CjwvZG9jOlhNTERvY3VtZW50Pg==</Base64Content></HashInputData><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyXMLSignatureResponse>
\ No newline at end of file
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.Enveloped.xml b/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.Enveloped.xml
deleted file mode 100644
index d97e76f78..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.Enveloped.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
-  <DateTime>2004-08-18T17:00:00+02:00</DateTime>
-  <VerifySignatureInfo>
-    <VerifySignatureEnvironment Reference="http://localhost:8080/referencedData/XMLDocument.signed.xml"/>
-    <VerifySignatureLocation xmlns:doc="urn:document" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">/doc:XMLDocument/dsig:Signature</VerifySignatureLocation>
-  </VerifySignatureInfo>
-  <ReturnHashInputData/>
-  <TrustProfileID>Test-Signaturdienste</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.FileURIs.DataObject.xml b/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.FileURIs.DataObject.xml
deleted file mode 100644
index 0e1d45506..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.FileURIs.DataObject.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureRequest
-	xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
-	xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://reference.e-government.gv.at/namespace/moa/20020822# file:D:/_java/moa-idspss/trunk/common/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.xsd
-	                http://www.w3.org/2000/09/xmldsig# http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd">
-	<VerifySignatureInfo>
-		<VerifySignatureEnvironment>
-			<XMLContent>
-				<dsig:Signature Id="signature-1-1"
-					xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-					<dsig:SignedInfo>
-						<dsig:CanonicalizationMethod
-							Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
-						<dsig:SignatureMethod
-							Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1" />
-						<dsig:Reference
-							Type="http://www.w3.org/2000/09/xmldsig#Manifest"
-							URI="#dsig-manifest-1-1">
-							<dsig:DigestMethod
-								Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-							<dsig:DigestValue>
-								XRuYnuRTOAInpu8TzwDWn9Er4/Y=
-							</dsig:DigestValue>
-						</dsig:Reference>
-					</dsig:SignedInfo>
-					<dsig:SignatureValue>
-						O3/U4zcVG6BOdc2C/m09xe+vxGhp6TKz7lEukgjINsc1o1Bvdelo77T8cEG/muYd
-					</dsig:SignatureValue>
-					<dsig:KeyInfo>
-						<dsig:X509Data>
-							<dsig:X509Certificate>
-								MIIELjCCAxagAwIBAgIBEzANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJBVDEQ
-								MA4GA1UEChMHVFUgR3JhejENMAsGA1UECxMERUdJWjEUMBIGA1UEAxMLTU9BIFRl
-								c3QgQ0EwHhcNMDcwODIzMTM1ODU0WhcNMTIwODIzMTM1ODU0WjBpMQswCQYDVQQG
-								EwJBVDEQMA4GA1UEChMHVFUgR1JBWjENMAsGA1UECxMERUdJWjE5MDcGA1UEAxMw
-								VGVzdCBTaWduYXR1cmRpZW5zdCBhbGxlciBLdW5kZW46IEVDRFNBIChQMTkydjEp
-								MIHzMIG8BgcqhkjOPQIBMIGwAgEBMCQGByqGSM49AQECGQD/////////////////
-								///+//////////8wNAQY/////////////////////v/////////8BBhkIQUZ5ZyA
-								5w+n6atyJDBJ/rje7MFGubEEMQQYjagOsDCQ9ny/IOtDoYgA9P8K/YL/EBIHGSuV
-								/8jaeGMQEe1rJM3Vc/l3oR55SBECGQD///////////////+Z3vg2FGvJsbTSKDEC
-								AQEDMgAExf78b6N6BUhK+FHmunDUCQefSxpQmC6m4yq/+pqdDMJalTWATFhQwZqE
-								qSMXJ2Tqo4IBNDCCATAwDgYDVR0PAQH/BAQDAgbAMAwGA1UdEwEB/wQCMAAwHQYD
-								VR0OBBYEFBrwapQSMwabwPPOijtgOu3iNlt3MHAGA1UdIARpMGcwZQYMKwYBBAGV
-								EgECewEBMFUwUwYIKwYBBQUHAgIwRxpFVGhpcyBjZXJ0aWZpY2F0ZSBvbmx5IG1h
-								eSBiZSB1c2VkIGZvciBkZW1vbnN0cmF0aW9uIGFuZCB0ZXN0IHB1cnBvc2VzMEYG
-								A1UdHwQ/MD0wO6A5oDeGNWh0dHA6Ly9tb2EtaWRzcHNzLmVnb3ZsYWJzLmd2LmF0
-								L2NybHMvbW9hLXRlc3QtY2EuY3JsMBYGByooAAoBAQEECxMJRUdJWi1UZXN0MB8G
-								A1UdIwQYMBaAFFKXvB3Ugd6H51ClcBGdjhYJNiRSMA0GCSqGSIb3DQEBBQUAA4IB
-								AQB60RLi9zIwF/Rmy/Wo0yf1/ZktElIt91vfBsXlpgLJ4Q6ol/4hTjMJ4FIa8GOl
-								0b9dIkEe+WGq77JFJVgltsRoJfQBSvnK9jdLfB5YJD0ETDnMdckBV+RsxkEtl5Lr
-								IrT6vExyJUAWz15XJiHgkYZncJCBTy1oh8f3V8cR1VZYwO4QBRDwRdVdZsaL5PME
-								vvLrcAMJhF5fS4AiqMex2Eh2kav5t6/I5bmB4CKEe+0+dPO8DGl7areEfzQEPd8p
-								jkkX5PnxriQvZfgVzwrdXGDqMTnBNaRtCGMiQU/0kp21a6BVtT4am27yr9p3ddhl
-								z7sJ4Z6ys1bwB0on/O65tdn7
-							</dsig:X509Certificate>
-						</dsig:X509Data>
-					</dsig:KeyInfo>
-					<dsig:Object>
-						<dsig:Manifest Id="dsig-manifest-1-1">
-							<dsig:Reference Id="reference-1-1"
-								URI="file:referencedData/Text.txt">
-								<dsig:DigestMethod
-									Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-								<dsig:DigestValue>
-									TrE7WPVlNnBf1dh9PRiZdwpTaxs=
-								</dsig:DigestValue>
-							</dsig:Reference>
-						</dsig:Manifest>
-					</dsig:Object>
-				</dsig:Signature>
-			</XMLContent>
-		</VerifySignatureEnvironment>
-		<VerifySignatureLocation
-			xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-			/dsig:Signature
-		</VerifySignatureLocation>
-	</VerifySignatureInfo>
-	<TrustProfileID>Test-Signaturdienste</TrustProfileID>
-</VerifyXMLSignatureRequest>
-
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.FileURIs.ServerSupplements.xml b/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.FileURIs.ServerSupplements.xml
deleted file mode 100644
index ba06d7100..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.FileURIs.ServerSupplements.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureRequest
-  xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
-  xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://reference.e-government.gv.at/namespace/moa/20020822# file:D:/_java/moa-idspss/trunk/common/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.xsd
-                  http://www.w3.org/2000/09/xmldsig# http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd">
-  <VerifySignatureInfo>
-    <VerifySignatureEnvironment>
-      <XMLContent>
-        <dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" Id="signature-1208432475-242867937-18096">
-          <dsig:SignedInfo>
-            <dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
-            <dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-            <dsig:Reference Id="signed-data-reference-0-1208432475-242867937-22960" URI="urn:Document">
-              <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-              <dsig:DigestValue>te0YD8LFaK3JLQV8cL69DPnFRLc=</dsig:DigestValue>
-            </dsig:Reference>
-            <dsig:Reference Id="etsi-data-reference-0-1208432475-242867937-11431" Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('etsi-data-object-0-1208432475-242867937-12332')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)">
-              <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-              <dsig:DigestValue>2M9g7DopnXtz86dkz+7yk5SHSHo=</dsig:DigestValue>
-            </dsig:Reference>
-          </dsig:SignedInfo>
-          <dsig:SignatureValue>Ti3ckR8eq4D0mUhb+ylUFhIYn7mfUHTc2AjTys4oaq4gFkXvQlQI41Iggp40c916</dsig:SignatureValue>
-          <dsig:KeyInfo>
-            <dsig:X509Data>
-              <dsig:X509Certificate>MIIDlzCCAf+gAwIBAgIRMrFTcaHacn5T5kRFML4Ck6swDQYJKoZIhvcNAQEFBQAwTTESMBAGA1UEAwwJVlNpZyBDQSAyMSowKAYDVQQKDCFIYXVwdHZlcmJhbmQgw7ZzdGVyci4gU296aWFsdmVycy4xCzAJBgNVBAYTAkFUMB4XDTA2MDEyMDA1MTExMVoXDTExMDEyMDA1MTExMVowXzEVMBMGA1UEAwwMRGF2aWQgRmVyYmFzMSowKAYDVQQKDCFIYXVwdHZlcmJhbmQgw7ZzdGVyci4gU296aWFsdmVycy4xDTALBgNVBAsMBFZTaWcxCzAJBgNVBAYTAkFUMEkwEwYHKoZIzj0CAQYIKoZIzj0DAQEDMgAEc7ESyZ4IdIM9UDtze29i0IqfCbwWSODfCF8bTiXxdJZLWZOE0eqwL2ybWVTEmCXDo4G6MIG3MBMGA1UdIwQMMAqACEhpdVw8ryMqMBEGA1UdDgQKBAhP473ttlxOBjAOBgNVHQ8BAf8EBAMCBsAwFgYDVR0gBA8wDTALBgkqKAAKAQQBZgAwQwYIKwYBBQUHAQEENzA1MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5lY2FyZC5zb3ppYWx2ZXJzaWNoZXJ1bmcuYXQwIAYDVR0RBBkwF4EVZGF2aWQuZmVyYmFzQGlub2RlLmF0MA0GCSqGSIb3DQEBBQUAA4IBgQAu74FsENLTC9kqN4UVEX+pJz4ckOjAI8NbzCEvHgDqfpXmjZKA+8354fE6hsCd8uCJWCJ36ig2cMcOjGJrW+4YExYFRpiq1U2u9N1eKEj7j1oQzNZw4lotDxMFHnzd5WBjXjWekgy3uWkFhqE+NvQtauNtRiR3kg2jMt4MmcjZpck3WoTibrV9sMOzyM8L4y3HdDix97aWTefqxJ28IF9Anuk/uNGu74KcuJjYuIZx7q1ULsuXEs/HJMxU2/9lcT6lRhsp5VE0Z0/zOWdenQYUBscdbNrEDg3gmGU9T7SuxNQfHRLQ1OGzjolJL7kvhsRiK/l7pBtGAt2oPO6OKbLgWhW/6DEYJqnUrScQCli34EVDFC8W9yOBq3BHHZCQOzGgYtxtpI2QzCHLMGEwaxdFAYQp9pVBnX7HGbPqhq2r5osDlcyJDLO9uYW+63CTCVIeJ9018OxvOxNNvb6JzunW/oQAVMj+vTiR4GE74A0qVbuYd0fvEvc47J1q6++QlKc=</dsig:X509Certificate>
-            </dsig:X509Data>
-          </dsig:KeyInfo>
-          <dsig:Object Id="etsi-data-object-0-1208432475-242867937-12332">
-            <etsi:QualifyingProperties xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#" Target="#signature-1208432475-242867937-18096">
-              <etsi:SignedProperties xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#">
-                <etsi:SignedSignatureProperties>
-                  <etsi:SigningTime>2008-04-17T11:41:15Z</etsi:SigningTime>
-                  <etsi:SigningCertificate>
-                    <etsi:Cert>
-                      <etsi:CertDigest>
-                        <etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-                        <etsi:DigestValue>RREWB1U7AWw/Xy+QkwfAiityVDs=</etsi:DigestValue>
-                      </etsi:CertDigest>
-                      <etsi:IssuerSerial>
-                        <dsig:X509IssuerName>C=AT,O=Hauptverband österr. Sozialvers.,CN=VSig CA 2</dsig:X509IssuerName>
-                        <dsig:X509SerialNumber>17249824966675737197051526866457224975275</dsig:X509SerialNumber>
-                      </etsi:IssuerSerial>
-                    </etsi:Cert>
-                  </etsi:SigningCertificate>
-                  <etsi:SignaturePolicyIdentifier>
-                    <etsi:SignaturePolicyImplied/>
-                  </etsi:SignaturePolicyIdentifier>
-                </etsi:SignedSignatureProperties>
-                <etsi:SignedDataObjectProperties>
-                  <etsi:DataObjectFormat ObjectReference="#signed-data-reference-0-1208432475-242867937-22960">
-                    <etsi:MimeType>text/plain</etsi:MimeType>
-                  </etsi:DataObjectFormat>
-                </etsi:SignedDataObjectProperties>
-              </etsi:SignedProperties>
-            </etsi:QualifyingProperties>
-          </dsig:Object>
-        </dsig:Signature>
-      </XMLContent>
-    </VerifySignatureEnvironment>
-    <VerifySignatureLocation xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">/dsig:Signature</VerifySignatureLocation>
-  </VerifySignatureInfo>
-  <SupplementProfileID>testID</SupplementProfileID>
-  <TrustProfileID>certifiedSignature+Test</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.FileURIs.Supplements.xml b/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.FileURIs.Supplements.xml
deleted file mode 100644
index 5d3632a0d..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.FileURIs.Supplements.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureRequest
-  xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#"
-  xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://reference.e-government.gv.at/namespace/moa/20020822# file:D:/_java/moa-idspss/trunk/common/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.xsd
-                  http://www.w3.org/2000/09/xmldsig# http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd">
-	<VerifySignatureInfo>
-		<VerifySignatureEnvironment>
-			<XMLContent>
-				<dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" Id="signature-1208432475-242867937-18096">
-					<dsig:SignedInfo>
-						<dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
-						<dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-						<dsig:Reference Id="signed-data-reference-0-1208432475-242867937-22960" URI="urn:Document">
-							<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-							<dsig:DigestValue>te0YD8LFaK3JLQV8cL69DPnFRLc=</dsig:DigestValue>
-						</dsig:Reference>
-						<dsig:Reference Id="etsi-data-reference-0-1208432475-242867937-11431" Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id('etsi-data-object-0-1208432475-242867937-12332')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)">
-							<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-							<dsig:DigestValue>2M9g7DopnXtz86dkz+7yk5SHSHo=</dsig:DigestValue>
-						</dsig:Reference>
-					</dsig:SignedInfo>
-					<dsig:SignatureValue>Ti3ckR8eq4D0mUhb+ylUFhIYn7mfUHTc2AjTys4oaq4gFkXvQlQI41Iggp40c916</dsig:SignatureValue>
-					<dsig:KeyInfo>
-						<dsig:X509Data>
-							<dsig:X509Certificate>MIIDlzCCAf+gAwIBAgIRMrFTcaHacn5T5kRFML4Ck6swDQYJKoZIhvcNAQEFBQAwTTESMBAGA1UEAwwJVlNpZyBDQSAyMSowKAYDVQQKDCFIYXVwdHZlcmJhbmQgw7ZzdGVyci4gU296aWFsdmVycy4xCzAJBgNVBAYTAkFUMB4XDTA2MDEyMDA1MTExMVoXDTExMDEyMDA1MTExMVowXzEVMBMGA1UEAwwMRGF2aWQgRmVyYmFzMSowKAYDVQQKDCFIYXVwdHZlcmJhbmQgw7ZzdGVyci4gU296aWFsdmVycy4xDTALBgNVBAsMBFZTaWcxCzAJBgNVBAYTAkFUMEkwEwYHKoZIzj0CAQYIKoZIzj0DAQEDMgAEc7ESyZ4IdIM9UDtze29i0IqfCbwWSODfCF8bTiXxdJZLWZOE0eqwL2ybWVTEmCXDo4G6MIG3MBMGA1UdIwQMMAqACEhpdVw8ryMqMBEGA1UdDgQKBAhP473ttlxOBjAOBgNVHQ8BAf8EBAMCBsAwFgYDVR0gBA8wDTALBgkqKAAKAQQBZgAwQwYIKwYBBQUHAQEENzA1MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5lY2FyZC5zb3ppYWx2ZXJzaWNoZXJ1bmcuYXQwIAYDVR0RBBkwF4EVZGF2aWQuZmVyYmFzQGlub2RlLmF0MA0GCSqGSIb3DQEBBQUAA4IBgQAu74FsENLTC9kqN4UVEX+pJz4ckOjAI8NbzCEvHgDqfpXmjZKA+8354fE6hsCd8uCJWCJ36ig2cMcOjGJrW+4YExYFRpiq1U2u9N1eKEj7j1oQzNZw4lotDxMFHnzd5WBjXjWekgy3uWkFhqE+NvQtauNtRiR3kg2jMt4MmcjZpck3WoTibrV9sMOzyM8L4y3HdDix97aWTefqxJ28IF9Anuk/uNGu74KcuJjYuIZx7q1ULsuXEs/HJMxU2/9lcT6lRhsp5VE0Z0/zOWdenQYUBscdbNrEDg3gmGU9T7SuxNQfHRLQ1OGzjolJL7kvhsRiK/l7pBtGAt2oPO6OKbLgWhW/6DEYJqnUrScQCli34EVDFC8W9yOBq3BHHZCQOzGgYtxtpI2QzCHLMGEwaxdFAYQp9pVBnX7HGbPqhq2r5osDlcyJDLO9uYW+63CTCVIeJ9018OxvOxNNvb6JzunW/oQAVMj+vTiR4GE74A0qVbuYd0fvEvc47J1q6++QlKc=</dsig:X509Certificate>
-						</dsig:X509Data>
-					</dsig:KeyInfo>
-					<dsig:Object Id="etsi-data-object-0-1208432475-242867937-12332">
-						<etsi:QualifyingProperties xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#" Target="#signature-1208432475-242867937-18096">
-							<etsi:SignedProperties xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#">
-								<etsi:SignedSignatureProperties>
-									<etsi:SigningTime>2008-04-17T11:41:15Z</etsi:SigningTime>
-									<etsi:SigningCertificate>
-										<etsi:Cert>
-											<etsi:CertDigest>
-												<etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-												<etsi:DigestValue>RREWB1U7AWw/Xy+QkwfAiityVDs=</etsi:DigestValue>
-											</etsi:CertDigest>
-											<etsi:IssuerSerial>
-												<dsig:X509IssuerName>C=AT,O=Hauptverband österr. Sozialvers.,CN=VSig CA 2</dsig:X509IssuerName>
-												<dsig:X509SerialNumber>17249824966675737197051526866457224975275</dsig:X509SerialNumber>
-											</etsi:IssuerSerial>
-										</etsi:Cert>
-									</etsi:SigningCertificate>
-									<etsi:SignaturePolicyIdentifier>
-										<etsi:SignaturePolicyImplied/>
-									</etsi:SignaturePolicyIdentifier>
-								</etsi:SignedSignatureProperties>
-								<etsi:SignedDataObjectProperties>
-									<etsi:DataObjectFormat ObjectReference="#signed-data-reference-0-1208432475-242867937-22960">
-										<etsi:MimeType>text/plain</etsi:MimeType>
-									</etsi:DataObjectFormat>
-								</etsi:SignedDataObjectProperties>
-							</etsi:SignedProperties>
-						</etsi:QualifyingProperties>
-					</dsig:Object>
-				</dsig:Signature>
-			</XMLContent>
-		</VerifySignatureEnvironment>
-		<VerifySignatureLocation xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">/dsig:Signature</VerifySignatureLocation>
-	</VerifySignatureInfo>
-	<SupplementProfile>
-		<Content Reference="urn:Document">
-			<LocRefContent>file:D:/Programme/apache-tomcat-5.5.26/webapps/referencedData/enno-sp.pdf_bku_sign_out.pdf</LocRefContent>
-		</Content>
-	</SupplementProfile>
-	<TrustProfileID>certifiedSignature+Test</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.FileURIs.xml b/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.FileURIs.xml
deleted file mode 100644
index 973f985ff..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.FileURIs.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureRequest
-	xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
-	<VerifySignatureInfo>
-		<VerifySignatureEnvironment>
-			<XMLContent>
-				<dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-					<dsig:SignedInfo>
-						<dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
-						<dsig:SignatureMethod	Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1" />
-						<dsig:Reference Id="reference-1-1" URI="file:../conf/server.xml">
-							<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-							<dsig:DigestValue>tLODyeiWFbAkQKwhrR23jtcgu4k=</dsig:DigestValue>
-						</dsig:Reference>
-					</dsig:SignedInfo>
-					<dsig:SignatureValue>
-						VEjXB6+geUL16oTPDVx5lcQliGl/oyVobug3BVxVwhu8CU7WK65moTcTuo/CL2hQ
-					</dsig:SignatureValue>
-					<dsig:KeyInfo>
-						<dsig:X509Data>
-							<dsig:X509Certificate>
-								MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-								VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-								CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-								bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-								CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-								IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-								A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-								UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-								/////////////v//////////MDQEGP////////////////////7//////////AQY
-								ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-								/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-								ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-								2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-								AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-								DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-								IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-								oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-								c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-								vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-								lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-								iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-								+tj+UiTiNNSaXirq
-							</dsig:X509Certificate>
-						</dsig:X509Data>
-					</dsig:KeyInfo>
-				</dsig:Signature>
-			</XMLContent>
-		</VerifySignatureEnvironment>
-    <VerifySignatureLocation xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">/dsig:Signature</VerifySignatureLocation>
-  </VerifySignatureInfo>
-  <SignatureManifestCheckParams ReturnReferenceInputData="true">
-    <ReferenceInfo>
-      <VerifyTransformsInfoProfile />
-    </ReferenceInfo>
-  </SignatureManifestCheckParams>
-	<TrustProfileID>Test-Signaturdienste</TrustProfileID>
-</VerifyXMLSignatureRequest>
\ No newline at end of file
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.SigManifest.resp.xml b/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.SigManifest.resp.xml
deleted file mode 100644
index 3798b2706..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.SigManifest.resp.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignerInfo><dsig:X509Data><dsig:X509SubjectName>CN=Test: Signaturdienst aller Kunden: ECDSA (P192v1),OU=Technik und Standards,O=Stabsstelle IKT-Strategie des Bundes,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate><PublicAuthority><Code>BKA-IKT</Code></PublicAuthority></dsig:X509Data></SignerInfo><ReferenceInputData PartOf="SignedInfo"><XMLContent xml:space="preserve"><doc:Paragraph ParaId="Para2" xmlns:doc="urn:document" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph></XMLContent></ReferenceInputData><ReferenceInputData PartOf="SignedInfo"><XMLContent xml:space="preserve"><dsig:Manifest Id="manifest-1-1" xmlns:doc="urn:document" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><dsig:Reference URI="http://localhost:8080/referencedData/XMLDocument.Para.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>B9nRChTbct68n9h5+Cb2mfNkASI=</dsig:DigestValue></dsig:Reference></dsig:Manifest></XMLContent></ReferenceInputData><ReferenceInputData PartOf="SignedInfo"><XMLContent xml:space="preserve"><etsi:SignedProperties xmlns:doc="urn:document" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><etsi:SignedSignatureProperties><etsi:SigningTime>2004-08-20T12:42:21</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>FOWcAqaHew69LEIDiGuiWVnB0mc=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1-1"><etsi:MimeType>application/xhtml+xml</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></XMLContent></ReferenceInputData><SignatureCheck><Code>0</Code></SignatureCheck><SignatureManifestCheck><Code>0</Code></SignatureManifestCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyXMLSignatureResponse>
\ No newline at end of file
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.SigManifest.xml b/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.SigManifest.xml
deleted file mode 100644
index 657beca77..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.SigManifest.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-  <VerifySignatureInfo>
-    <VerifySignatureEnvironment>
-      <XMLContent><doc:XMLDocument xmlns:doc="urn:document" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:document http://localhost:8080/referencedData/XMLDocument.xsd">
-  <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
-  <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#Para2"><dsig:Transforms><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">
-  <xsl:include href="http://localhost:8080/referencedData/XMLDocument.Para.xsl"/>
-</xsl:stylesheet></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>luM3wUmedTvkMHVedQkA/8otXUE=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.buergerkarte.at/specifications/Security-Layer/20020225#SignatureManifest" URI="#manifest-1-1"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>1aSV+vFkwG6NZCk5ZUzZV3J4eSo=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id(&apos;etsi-signed-1-1&apos;)/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>Dy1xXsV2LgSFJlGwYiunav1KC7A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>f1v/vi1S7xiL+7ofWOUqBfoqOy42EnlXYFoTYcaUZaBiAecDvyX9StPRWTUls/j2</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object><dsig:Manifest Id="manifest-1-1"><dsig:Reference URI="http://localhost:8080/referencedData/XMLDocument.Para.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>B9nRChTbct68n9h5+Cb2mfNkASI=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object><dsig:Object Id="etsi-signed-1-1"><etsi:QualifyingProperties Target="#signature-1-1" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2005-03-29T09:55:29</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>FOWcAqaHew69LEIDiGuiWVnB0mc=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1-1"><etsi:MimeType>application/xhtml+xml</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature>
-</doc:XMLDocument></XMLContent>
-    </VerifySignatureEnvironment>
-    <VerifySignatureLocation xmlns:doc="urn:document">/doc:XMLDocument/dsig:Signature</VerifySignatureLocation>
-  </VerifySignatureInfo>
-  <SignatureManifestCheckParams ReturnReferenceInputData="true">
-    <ReferenceInfo>
-      <VerifyTransformsInfoProfile>
-        <dsig:Transforms><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">
-  <xsl:include href="http://localhost:8080/referencedData/XMLDocument.Para.xsl"/>
-</xsl:stylesheet></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></dsig:Transforms>
-        <TransformParameter URI="http://localhost:8080/referencedData/XMLDocument.Para.xsl"/>
-      </VerifyTransformsInfoProfile>
-      <VerifyTransformsInfoProfile>
-        <dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms>
-      </VerifyTransformsInfoProfile>
-    </ReferenceInfo>
-  </SignatureManifestCheckParams>
-  <TrustProfileID>Test-Signaturdienste</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.Simple.resp.xml b/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.Simple.resp.xml
deleted file mode 100644
index 2fab33b20..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.Simple.resp.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignerInfo><dsig:X509Data><dsig:X509SubjectName>CN=Test: Signaturdienst aller Kunden: ECDSA (P192v1),OU=Technik und Standards,O=Stabsstelle IKT-Strategie des Bundes,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate><PublicAuthority><Code>BKA-IKT</Code></PublicAuthority></dsig:X509Data></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyXMLSignatureResponse>
\ No newline at end of file
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.Simple.xml b/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.Simple.xml
deleted file mode 100644
index 5565601d8..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.Simple.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
-  <VerifySignatureInfo>
-    <VerifySignatureEnvironment>
-      <XMLContent><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#xpointer(id(&apos;signed-data-1-1-1&apos;)/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>tLODyeiWFbAkQKwhrR23jtcgu4k=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>VEjXB6+geUL16oTPDVx5lcQliGl/oyVobug3BVxVwhu8CU7WK65moTcTuo/CL2hQ</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="signed-data-1-1-1">Diese Daten werden signiert.</dsig:Object></dsig:Signature></XMLContent></VerifySignatureEnvironment>
-    <VerifySignatureLocation xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">/dsig:Signature</VerifySignatureLocation>
-  </VerifySignatureInfo>
-  <TrustProfileID>Test-Signaturdienste</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.Supplements.resp.xml b/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.Supplements.resp.xml
deleted file mode 100644
index 2fab33b20..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.Supplements.resp.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignerInfo><dsig:X509Data><dsig:X509SubjectName>CN=Test: Signaturdienst aller Kunden: ECDSA (P192v1),OU=Technik und Standards,O=Stabsstelle IKT-Strategie des Bundes,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate><PublicAuthority><Code>BKA-IKT</Code></PublicAuthority></dsig:X509Data></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyXMLSignatureResponse>
\ No newline at end of file
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.Supplements.xml b/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.Supplements.xml
deleted file mode 100644
index 50ddbc1da..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.Supplements.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
-  <VerifySignatureInfo>
-    <VerifySignatureEnvironment>
-      <XMLContent><doc:XMLDocument xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:doc="urn:document" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:document urn:XMLDocument.xsd">
-  <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
-  <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#Para2"><dsig:Transforms><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">
-  <xsl:include href="XMLDocument.Para.xsl"/>
-</xsl:stylesheet></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>luM3wUmedTvkMHVedQkA/8otXUE=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>vGVimRmUHwrDR8feQCK1DZ2kyDw0CCrXimJi/yCrIoqSkUKFlKrtAyP2RUBXXjye</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo></dsig:Signature>
-</doc:XMLDocument></XMLContent>
-    </VerifySignatureEnvironment>
-    <VerifySignatureLocation xmlns:doc="urn:document" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">/doc:XMLDocument/dsig:Signature</VerifySignatureLocation>
-  </VerifySignatureInfo>
-  <SupplementProfile>
-    <Content Reference="XMLDocument.Para.xsl">
-      <LocRefContent>http://localhost:8080/referencedData/XMLDocument.Para.xsl</LocRefContent>
-    </Content>
-  </SupplementProfile>
-  <SupplementProfile>
-    <Content Reference="urn:XMLDocument.xsd">
-      <XMLContent><xs:schema targetNamespace="urn:document" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:document" elementFormDefault="qualified" attributeFormDefault="unqualified">
-  <xs:element name="XMLDocument">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="Paragraph" maxOccurs="unbounded">
-          <xs:complexType mixed="true">
-            <xs:attribute name="ParaId" type="xs:ID" use="optional"/>
-          </xs:complexType>
-        </xs:element>
-        <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
-
-</XMLContent>
-    </Content>
-  </SupplementProfile>
-  <TrustProfileID>Test-Signaturdienste</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.resp.xml b/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.resp.xml
deleted file mode 100644
index 9d3b6dea7..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.resp.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignerInfo><dsig:X509Data><dsig:X509SubjectName>CN=Test: Signaturdienst aller Kunden: ECDSA (P192v1),OU=Technik und Standards,O=Stabsstelle IKT-Strategie des Bundes,C=AT</dsig:X509SubjectName><dsig:X509IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></dsig:X509IssuerSerial><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate><PublicAuthority><Code>BKA-IKT</Code></PublicAuthority></dsig:X509Data></SignerInfo><SignatureCheck><Code>0</Code></SignatureCheck><XMLDSIGManifestCheck><Code>0</Code><Info><ReferringSigReference>1</ReferringSigReference></Info></XMLDSIGManifestCheck><CertificateCheck><Code>0</Code></CertificateCheck></VerifyXMLSignatureResponse>
\ No newline at end of file
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.xml b/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.xml
deleted file mode 100644
index a57fbb934..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/VerifyXMLSignatureRequest.XMLDSigManifest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VerifyXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-  <VerifySignatureInfo>
-    <VerifySignatureEnvironment>
-      <XMLContent><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Type="http://www.w3.org/2000/09/xmldsig#Manifest" URI="#dsig-manifest-1-1"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>nUUaW6OtcsNvV/QhqmkU2QXT1Mw=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>pzI1j60BNsnS+zjXYtXlh109HjJGEMrMzTzkUB54rReOpI1ynNkG2RE7AiOlvpPh</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="signed-data-1-1-1">Diese Daten sind signiert.</dsig:Object><dsig:Object><dsig:Manifest Id="dsig-manifest-1-1"><dsig:Reference Id="reference-1-1" URI="#xpointer(id(&apos;signed-data-1-1-1&apos;)/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>EYxznGxNRAIcHQeUsj+zsK+uaHA=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object></dsig:Signature></XMLContent>
-    </VerifySignatureEnvironment>
-    <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>
-  </VerifySignatureInfo>
-  <TrustProfileID>Test-Signaturdienste</TrustProfileID>
-</VerifyXMLSignatureRequest>
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.Enveloped.response.xml b/spss/handbook/clients/webservice/bin/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.Enveloped.response.xml
deleted file mode 100644
index be2eb37ad..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.Enveloped.response.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignatureEnvironment><doc:XMLDocument xmlns:doc="urn:document">
-  <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
-  <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI=""><dsig:Transforms><dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>2b83+NbXDFijHzz+sH0T7fM36sA=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>30zsZMPn1mR5G5oIGJvTRmCik3WuepfZF6AhLwxgJDMJlPQ8rheBWCaKihzXnHaS</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo></dsig:Signature>
-</doc:XMLDocument></SignatureEnvironment></CreateXMLSignatureResponse>
\ No newline at end of file
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.Enveloped.xml b/spss/handbook/clients/webservice/bin/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.Enveloped.xml
deleted file mode 100644
index 7f89028c6..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.Enveloped.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-  <KeyIdentifier>KG_allgemein</KeyIdentifier>
-  <SingleSignatureInfo SecurityLayerConformity="false">
-    <DataObjectInfo Structure="detached">
-      <DataObject Reference=""/>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <dsig:Transforms>
-            <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
-          </dsig:Transforms>
-          <FinalDataMetaInfo>
-            <MimeType>text/xml</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <CreateSignatureInfo>
-      <CreateSignatureEnvironment Reference="http://localhost:8080/referencedData/XMLDocument.xml"/>
-      <CreateSignatureEnvironmentProfile>
-        <CreateSignatureLocation Index="4" xmlns:doc="urn:document">/doc:XMLDocument</CreateSignatureLocation>
-      </CreateSignatureEnvironmentProfile>
-    </CreateSignatureInfo>
-  </SingleSignatureInfo>
-</CreateXMLSignatureRequest>
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.SigManifest.response.xml b/spss/handbook/clients/webservice/bin/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.SigManifest.response.xml
deleted file mode 100644
index fb4204a09..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.SigManifest.response.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignatureEnvironment><doc:XMLDocument xmlns:doc="urn:document" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:document http://localhost:8080/referencedData/XMLDocument.xsd">
-  <doc:Paragraph>Ich bin der erste Absatz in diesem Dokument.</doc:Paragraph>
-  <doc:Paragraph ParaId="Para2">Und ich bin der zweite Absatz in diesem Dokument.
-Ich habe weiters ein eigenens ID-Attribut bekommen.</doc:Paragraph><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#Para2"><dsig:Transforms><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">
-  <xsl:include href="http://localhost:8080/referencedData/XMLDocument.Para.xsl"/>
-</xsl:stylesheet></dsig:Transform><dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>luM3wUmedTvkMHVedQkA/8otXUE=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://www.buergerkarte.at/specifications/Security-Layer/20020225#SignatureManifest" URI="#manifest-1-1"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>1aSV+vFkwG6NZCk5ZUzZV3J4eSo=</dsig:DigestValue></dsig:Reference><dsig:Reference Type="http://uri.etsi.org/01903/v1.1.1#SignedProperties" URI="#xmlns(etsi=http://uri.etsi.org/01903/v1.1.1%23)%20xpointer(id(&apos;etsi-signed-1-1&apos;)/child::etsi:QualifyingProperties/child::etsi:SignedProperties)"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>Dy1xXsV2LgSFJlGwYiunav1KC7A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>f1v/vi1S7xiL+7ofWOUqBfoqOy42EnlXYFoTYcaUZaBiAecDvyX9StPRWTUls/j2</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object><dsig:Manifest Id="manifest-1-1"><dsig:Reference URI="http://localhost:8080/referencedData/XMLDocument.Para.xsl"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>B9nRChTbct68n9h5+Cb2mfNkASI=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object><dsig:Object Id="etsi-signed-1-1"><etsi:QualifyingProperties Target="#signature-1-1" xmlns:etsi="http://uri.etsi.org/01903/v1.1.1#"><etsi:SignedProperties><etsi:SignedSignatureProperties><etsi:SigningTime>2005-03-29T09:55:29</etsi:SigningTime><etsi:SigningCertificate><etsi:Cert><etsi:CertDigest><etsi:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><etsi:DigestValue>FOWcAqaHew69LEIDiGuiWVnB0mc=</etsi:DigestValue></etsi:CertDigest><etsi:IssuerSerial><dsig:X509IssuerName>CN=Test CA - Signaturdienste,OU=Technik und Standards,O=Stabstelle IKT-Strategie des Bundes,C=AT</dsig:X509IssuerName><dsig:X509SerialNumber>9</dsig:X509SerialNumber></etsi:IssuerSerial></etsi:Cert></etsi:SigningCertificate><etsi:SignaturePolicyIdentifier><etsi:SignaturePolicyImplied/></etsi:SignaturePolicyIdentifier></etsi:SignedSignatureProperties><etsi:SignedDataObjectProperties><etsi:DataObjectFormat ObjectReference="#reference-1-1"><etsi:MimeType>application/xhtml+xml</etsi:MimeType></etsi:DataObjectFormat></etsi:SignedDataObjectProperties></etsi:SignedProperties></etsi:QualifyingProperties></dsig:Object></dsig:Signature>
-</doc:XMLDocument></SignatureEnvironment></CreateXMLSignatureResponse>
\ No newline at end of file
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.SigManifest.xml b/spss/handbook/clients/webservice/bin/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.SigManifest.xml
deleted file mode 100644
index b19f66b61..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.SigManifest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-  <KeyIdentifier>KG_allgemein</KeyIdentifier>
-  <SingleSignatureInfo SecurityLayerConformity="true">
-    <DataObjectInfo Structure="detached">
-      <DataObject Reference="#Para2"/>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <dsig:Transforms>
-            <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">
-  <xsl:include href="http://localhost:8080/referencedData/XMLDocument.Para.xsl"/>
-</xsl:stylesheet>              
-            </dsig:Transform>
-            <dsig:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
-          </dsig:Transforms>
-          <FinalDataMetaInfo>
-            <MimeType>application/xhtml+xml</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-    <CreateSignatureInfo>
-      <CreateSignatureEnvironment Reference="http://localhost:8080/referencedData/XMLDocument.withResolvableSchemaHint.xml"/>
-      <CreateSignatureEnvironmentProfile>
-        <CreateSignatureLocation Index="4" xmlns:doc="urn:document">/doc:XMLDocument</CreateSignatureLocation>
-      </CreateSignatureEnvironmentProfile>
-    </CreateSignatureInfo>
-  </SingleSignatureInfo>
-</CreateXMLSignatureRequest>
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.XMLDSigManifest.response.xml b/spss/handbook/clients/webservice/bin/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.XMLDSigManifest.response.xml
deleted file mode 100644
index a465e2126..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.XMLDSigManifest.response.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureResponse xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><SignatureEnvironment><dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Type="http://www.w3.org/2000/09/xmldsig#Manifest" URI="#dsig-manifest-1-1"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>nUUaW6OtcsNvV/QhqmkU2QXT1Mw=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>pzI1j60BNsnS+zjXYtXlh109HjJGEMrMzTzkUB54rReOpI1ynNkG2RE7AiOlvpPh</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD
-VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE
-CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln
-bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx
-CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll
-IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG
-A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo
-UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA////////
-/////////////v//////////MDQEGP////////////////////7//////////AQY
-ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C
-/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr
-ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv
-2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E
-AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG
-DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0
-IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2
-oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu
-c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw
-vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt
-lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja
-iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7
-+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="signed-data-1-1-1">Diese Daten sind signiert.</dsig:Object><dsig:Object><dsig:Manifest Id="dsig-manifest-1-1"><dsig:Reference Id="reference-1-1" URI="#xpointer(id(&apos;signed-data-1-1-1&apos;)/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>EYxznGxNRAIcHQeUsj+zsK+uaHA=</dsig:DigestValue></dsig:Reference></dsig:Manifest></dsig:Object></dsig:Signature></SignatureEnvironment></CreateXMLSignatureResponse>
\ No newline at end of file
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.XMLDSigManifest.xml b/spss/handbook/clients/webservice/bin/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.XMLDSigManifest.xml
deleted file mode 100644
index da7e82025..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/signatures2bverified/CreateXMLSignatureRequest.VerifyXML.XMLDSigManifest.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateXMLSignatureRequest xmlns="http://reference.e-government.gv.at/namespace/moa/20020822#">
-  <KeyIdentifier>KG_allgemein</KeyIdentifier>
-  <SingleSignatureInfo SecurityLayerConformity="false">
-    <DataObjectInfo Structure="enveloping" ChildOfManifest="true">
-      <DataObject>
-        <XMLContent>Diese Daten sind signiert.</XMLContent>
-      </DataObject>
-      <CreateTransformsInfoProfile>
-        <CreateTransformsInfo>
-          <FinalDataMetaInfo>
-            <MimeType>text/plain</MimeType>
-          </FinalDataMetaInfo>
-        </CreateTransformsInfo>
-      </CreateTransformsInfoProfile>
-    </DataObjectInfo>
-  </SingleSignatureInfo>
-</CreateXMLSignatureRequest>
\ No newline at end of file
diff --git a/spss/handbook/clients/webservice/bin/resources/requests/transformResults/CreateXMLSignatureRequest.Transforms.hashinput.ref2.txt b/spss/handbook/clients/webservice/bin/resources/requests/transformResults/CreateXMLSignatureRequest.Transforms.hashinput.ref2.txt
deleted file mode 100644
index f8527bb6d..000000000
--- a/spss/handbook/clients/webservice/bin/resources/requests/transformResults/CreateXMLSignatureRequest.Transforms.hashinput.ref2.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:doc="urn:document">
-<head>
-<title>HTML-Dokument</title>
-</head>
-<body>
-<p>Ich bin der erste Absatz in diesem Dokument.</p>
-</body>
-</html>
diff --git a/spss/handbook/clients/webservice/bin/resources/sslKeys/customer1/moa-ssl-kunde1.cer b/spss/handbook/clients/webservice/bin/resources/sslKeys/customer1/moa-ssl-kunde1.cer
deleted file mode 100644
index dc8a6921f..000000000
--- a/spss/handbook/clients/webservice/bin/resources/sslKeys/customer1/moa-ssl-kunde1.cer
+++ /dev/null
diff --git a/spss/handbook/clients/webservice/bin/resources/sslKeys/customer1/moa-ssl-kunde1[pwd=kunde1].p12 b/spss/handbook/clients/webservice/bin/resources/sslKeys/customer1/moa-ssl-kunde1[pwd=kunde1].p12
deleted file mode 100644
index ea67e4ae0..000000000
--- a/spss/handbook/clients/webservice/bin/resources/sslKeys/customer1/moa-ssl-kunde1[pwd=kunde1].p12
+++ /dev/null
diff --git a/spss/handbook/clients/webservice/bin/resources/sslKeys/customer1/trustedServers[pwd=servers].keystore b/spss/handbook/clients/webservice/bin/resources/sslKeys/customer1/trustedServers[pwd=servers].keystore
deleted file mode 100644
index db78c54ab..000000000
--- a/spss/handbook/clients/webservice/bin/resources/sslKeys/customer1/trustedServers[pwd=servers].keystore
+++ /dev/null
diff --git a/spss/handbook/clients/webservice/bin/resources/sslKeys/customer2/moa-ssl-kunde2.cer b/spss/handbook/clients/webservice/bin/resources/sslKeys/customer2/moa-ssl-kunde2.cer
deleted file mode 100644
index 63f5dc755..000000000
--- a/spss/handbook/clients/webservice/bin/resources/sslKeys/customer2/moa-ssl-kunde2.cer
+++ /dev/null
diff --git a/spss/handbook/clients/webservice/bin/resources/sslKeys/customer2/moa-ssl-kunde2[pwd=kunde2].p12 b/spss/handbook/clients/webservice/bin/resources/sslKeys/customer2/moa-ssl-kunde2[pwd=kunde2].p12
deleted file mode 100644
index db7072544..000000000
--- a/spss/handbook/clients/webservice/bin/resources/sslKeys/customer2/moa-ssl-kunde2[pwd=kunde2].p12
+++ /dev/null
diff --git a/spss/handbook/clients/webservice/bin/resources/sslKeys/customer2/trustedServers[pwd=servers].keystore b/spss/handbook/clients/webservice/bin/resources/sslKeys/customer2/trustedServers[pwd=servers].keystore
deleted file mode 100644
index cbf43b046..000000000
--- a/spss/handbook/clients/webservice/bin/resources/sslKeys/customer2/trustedServers[pwd=servers].keystore
+++ /dev/null
diff --git a/spss/handbook/clients/webservice/bin/resources/sslKeys/server/localhost.cer b/spss/handbook/clients/webservice/bin/resources/sslKeys/server/localhost.cer
deleted file mode 100644
index 7bee8af02..000000000
--- a/spss/handbook/clients/webservice/bin/resources/sslKeys/server/localhost.cer
+++ /dev/null
diff --git a/spss/handbook/clients/webservice/bin/resources/sslKeys/server/tomcat[pwd=server].keystore b/spss/handbook/clients/webservice/bin/resources/sslKeys/server/tomcat[pwd=server].keystore
deleted file mode 100644
index a24520345..000000000
--- a/spss/handbook/clients/webservice/bin/resources/sslKeys/server/tomcat[pwd=server].keystore
+++ /dev/null
diff --git a/spss/handbook/clients/webservice/bin/resources/sslKeys/server/trustedClients[pwd=clients].keystore b/spss/handbook/clients/webservice/bin/resources/sslKeys/server/trustedClients[pwd=clients].keystore
deleted file mode 100644
index 44a40723b..000000000
--- a/spss/handbook/clients/webservice/bin/resources/sslKeys/server/trustedClients[pwd=clients].keystore
+++ /dev/null
diff --git a/spss/handbook/clients/webservice/bin/src/main/java/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTP.class b/spss/handbook/clients/webservice/bin/src/main/java/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTP.class
deleted file mode 100644
index 14eb737b7..000000000
--- a/spss/handbook/clients/webservice/bin/src/main/java/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTP.class
+++ /dev/null
diff --git a/spss/handbook/clients/webservice/bin/src/main/java/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTPSClientAuth.class b/spss/handbook/clients/webservice/bin/src/main/java/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTPSClientAuth.class
deleted file mode 100644
index 79eec495f..000000000
--- a/spss/handbook/clients/webservice/bin/src/main/java/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTPSClientAuth.class
+++ /dev/null
diff --git a/spss/handbook/clients/webservice/bin/src/main/java/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTPSServerAuth.class b/spss/handbook/clients/webservice/bin/src/main/java/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTPSServerAuth.class
deleted file mode 100644
index 2d14064a1..000000000
--- a/spss/handbook/clients/webservice/bin/src/main/java/at/gv/egovernment/moa/spss/handbook/clients/webservice/HTTPSServerAuth.class
+++ /dev/null
diff --git a/spss/handbook/clients/webservice/bin/target/.gitignore b/spss/handbook/clients/webservice/bin/target/.gitignore
deleted file mode 100644
index 8ba548b51..000000000
--- a/spss/handbook/clients/webservice/bin/target/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/classes
diff --git a/spss/handbook/clients/webservice/bin/target/maven-archiver/pom.properties b/spss/handbook/clients/webservice/bin/target/maven-archiver/pom.properties
deleted file mode 100644
index 8cb7f461e..000000000
--- a/spss/handbook/clients/webservice/bin/target/maven-archiver/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Thu Jan 30 09:01:05 CET 2014
-version=2.0
-groupId=MOA.spss.handbook.clients
-artifactId=moa-spss-handbook-webserviceClient
diff --git a/spss/handbook/clients/webservice/bin/target/moa-spss-handbook-webserviceClient-2.0.jar b/spss/handbook/clients/webservice/bin/target/moa-spss-handbook-webserviceClient-2.0.jar
deleted file mode 100644
index f5cbeb003..000000000
--- a/spss/handbook/clients/webservice/bin/target/moa-spss-handbook-webserviceClient-2.0.jar
+++ /dev/null
diff --git a/spss/handbook/clients/webservice/pom.xml b/spss/handbook/clients/webservice/pom.xml
index 0411bf40e..95f2c5173 100644
--- a/spss/handbook/clients/webservice/pom.xml
+++ b/spss/handbook/clients/webservice/pom.xml
@@ -6,8 +6,10 @@
 	</parent>

 	

 	<modelVersion>4.0.0</modelVersion>

+	<groupId>MOA.spss.handbook.clients</groupId>

 	<artifactId>moa-spss-handbook-webserviceClient</artifactId>

 	<packaging>jar</packaging>

+	<version>2.0</version>

 	<name>MOA SP/SS Handbook WebService Client</name>

 	

 	<properties>

@@ -132,7 +134,7 @@
 	</dependencies>

     <build>

         <plugins>

-<!--         		<plugin>

+        		<plugin>

             		<groupId>org.codehaus.mojo</groupId>

             		<artifactId>properties-maven-plugin</artifactId>

             		<version>1.0-alpha-2</version>

@@ -149,7 +151,7 @@
           		          </configuration>

               		  </execution>

             		</executions>

-        		</plugin> -->

+        		</plugin>

         	</plugins>

        </build>

 </project>

diff --git a/spss/handbook/pom.xml b/spss/handbook/pom.xml
index d4cf8e867..e9323a55f 100644
--- a/spss/handbook/pom.xml
+++ b/spss/handbook/pom.xml
@@ -22,7 +22,7 @@
   </properties>

       <build>

         <plugins>

-<!--         		<plugin>

+        		<plugin>

             		<groupId>org.codehaus.mojo</groupId>

             		<artifactId>properties-maven-plugin</artifactId>

             		<version>1.0-alpha-2</version>

@@ -39,7 +39,7 @@
           		          </configuration>

               		  </execution>

             		</executions>

-        		</plugin> -->

+        		</plugin>

         	</plugins>

        </build>

 </project>

diff --git a/spss/pom.xml b/spss/pom.xml
index 2f1d57446..5954b9b0a 100644
--- a/spss/pom.xml
+++ b/spss/pom.xml
@@ -23,7 +23,7 @@
 
     <build>
         <plugins>
-<!--         		<plugin>
+        		<plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -40,7 +40,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin> -->
+        		</plugin>
         	</plugins>
        </build>
 
diff --git a/spss/server/.project b/spss/server/.project
deleted file mode 100644
index e9b8d8502..000000000
--- a/spss/server/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>moa-spss</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/spss/server/.settings/org.eclipse.core.resources.prefs b/spss/server/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c020..000000000
--- a/spss/server/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/spss/server/.settings/org.eclipse.jdt.core.prefs b/spss/server/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 046ca3fd3..000000000
--- a/spss/server/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Thu Jan 03 11:06:02 CET 2013
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/spss/server/.settings/org.eclipse.m2e.core.prefs b/spss/server/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/spss/server/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/spss/server/.settings/org.maven.ide.eclipse.prefs b/spss/server/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 5fed4cf5a..000000000
--- a/spss/server/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/spss/server/pom.xml b/spss/server/pom.xml
index eb37775c1..08e740cd3 100644
--- a/spss/server/pom.xml
+++ b/spss/server/pom.xml
@@ -24,7 +24,7 @@
 

     <build>

         <plugins>

-<!--         		<plugin>

+        		<plugin>

             		<groupId>org.codehaus.mojo</groupId>

             		<artifactId>properties-maven-plugin</artifactId>

             		<version>1.0-alpha-2</version>

@@ -41,7 +41,7 @@
           		          </configuration>

               		  </execution>

             		</executions>

-        		</plugin> -->

+        		</plugin>

         	</plugins>

        </build>

 

diff --git a/spss/server/serverlib/.classpath b/spss/server/serverlib/.classpath
deleted file mode 100644
index c2e154781..000000000
--- a/spss/server/serverlib/.classpath
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/spss/server/serverlib/.gitignore b/spss/server/serverlib/.gitignore
deleted file mode 100644
index 4dc009173..000000000
--- a/spss/server/serverlib/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target
-/bin
diff --git a/spss/server/serverlib/.project b/spss/server/serverlib/.project
deleted file mode 100644
index 0d5bb33b5..000000000
--- a/spss/server/serverlib/.project
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>moa-spss-lib</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-	</natures>
-</projectDescription>
diff --git a/spss/server/serverlib/.settings/org.eclipse.core.resources.prefs b/spss/server/serverlib/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 839d647ee..000000000
--- a/spss/server/serverlib/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding/<project>=UTF-8
diff --git a/spss/server/serverlib/.settings/org.eclipse.jdt.core.prefs b/spss/server/serverlib/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 69c31cd49..000000000
--- a/spss/server/serverlib/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/spss/server/serverlib/.settings/org.eclipse.m2e.core.prefs b/spss/server/serverlib/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/spss/server/serverlib/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/spss/server/serverlib/.settings/org.eclipse.wst.common.component b/spss/server/serverlib/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index d4b85674b..000000000
--- a/spss/server/serverlib/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-  <wb-module deploy-name="moa-spss-lib">
-    <wb-resource deploy-path="/" source-path="src/main/java"/>
-    <wb-resource deploy-path="/" source-path="src/main/resources"/>
-        <wb-resource deploy-path="/" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/" source-path="/src/main/resources"/>
-  </wb-module>
-</project-modules>
diff --git a/spss/server/serverlib/.settings/org.eclipse.wst.common.project.facet.core.xml b/spss/server/serverlib/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 0c619da6d..000000000
--- a/spss/server/serverlib/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="jst.java"/>
-  <fixed facet="jst.utility"/>
-  <installed facet="jst.utility" version="1.0"/>
-  <installed facet="jst.java" version="1.6"/>
-</faceted-project>
diff --git a/spss/server/serverlib/.settings/org.eclipse.wst.validation.prefs b/spss/server/serverlib/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 04cad8cb7..000000000
--- a/spss/server/serverlib/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
diff --git a/spss/server/serverlib/.settings/org.maven.ide.eclipse.prefs b/spss/server/serverlib/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 5fed4cf5a..000000000
--- a/spss/server/serverlib/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index 3c29cd88c..fb95746da 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -64,7 +64,7 @@
 		<dependency>

 			<groupId>javax.servlet</groupId>

 			<artifactId>servlet-api</artifactId>

-			<scope>provided</scope>

+			<scope>compile</scope>

 		</dependency>

 		<dependency>

 			<groupId>xalan-bin-dist</groupId>

@@ -177,7 +177,7 @@
 	</dependencies>

     <build>

         <plugins>

-<!--         		<plugin>

+        		<plugin>

             		<groupId>org.codehaus.mojo</groupId>

             		<artifactId>properties-maven-plugin</artifactId>

             		<version>1.0-alpha-2</version>

@@ -194,7 +194,7 @@
           		          </configuration>

               		  </execution>

             		</executions>

-        		</plugin> -->

+        		</plugin>

 

 			<plugin>

 				<groupId>org.apache.maven.plugins</groupId>

diff --git a/spss/server/serverws/.classpath b/spss/server/serverws/.classpath
deleted file mode 100644
index 0cbbeaa3d..000000000
--- a/spss/server/serverws/.classpath
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/spss/server/serverws/.gitignore b/spss/server/serverws/.gitignore
deleted file mode 100644
index 934e0e06f..000000000
--- a/spss/server/serverws/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/bin
-/target
diff --git a/spss/server/serverws/.settings/org.eclipse.core.resources.prefs b/spss/server/serverws/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c020..000000000
--- a/spss/server/serverws/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/spss/server/serverws/.settings/org.eclipse.m2e.core.prefs b/spss/server/serverws/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/spss/server/serverws/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/spss/server/serverws/.settings/org.eclipse.wst.validation.prefs b/spss/server/serverws/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 04cad8cb7..000000000
--- a/spss/server/serverws/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-disabled=06target
-eclipse.preferences.version=1
diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml
index 56168a586..ac06946a4 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>${moa-spss-version}</version>
+    <version>2.0.1</version>
     <name>MOA SP/SS WebService</name>
 
     <properties>
@@ -67,7 +67,7 @@
                 </configuration>
             </plugin>
 
-<!--         		<plugin>
+        		<plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -84,7 +84,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin> -->
+        		</plugin>
         	</plugins>
        </build>
     <dependencies>
diff --git a/spss/server/tools/.classpath b/spss/server/tools/.classpath
deleted file mode 100644
index 9ae7bca0f..000000000
--- a/spss/server/tools/.classpath
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/spss/server/tools/.gitignore b/spss/server/tools/.gitignore
deleted file mode 100644
index 4dc009173..000000000
--- a/spss/server/tools/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target
-/bin
diff --git a/spss/server/tools/.project b/spss/server/tools/.project
deleted file mode 100644
index d7cefdfa8..000000000
--- a/spss/server/tools/.project
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>moa-spss-tools</name>
-	<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-	</natures>
-</projectDescription>
diff --git a/spss/server/tools/.settings/org.eclipse.core.resources.prefs b/spss/server/tools/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index abdea9ac0..000000000
--- a/spss/server/tools/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding/<project>=UTF-8
diff --git a/spss/server/tools/.settings/org.eclipse.jdt.core.prefs b/spss/server/tools/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 793f907b5..000000000
--- a/spss/server/tools/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Mon Aug 05 10:52:30 CEST 2013
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/spss/server/tools/.settings/org.eclipse.m2e.core.prefs b/spss/server/tools/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/spss/server/tools/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/spss/server/tools/.settings/org.maven.ide.eclipse.prefs b/spss/server/tools/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index de7b9a186..000000000
--- a/spss/server/tools/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Tue Jul 07 16:06:50 CEST 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/spss/server/tools/pom.xml b/spss/server/tools/pom.xml
index f139e962d..880eac2c1 100644
--- a/spss/server/tools/pom.xml
+++ b/spss/server/tools/pom.xml
@@ -9,7 +9,7 @@
   <groupId>MOA.spss.server</groupId>
   <artifactId>moa-spss-tools</artifactId>
   <packaging>jar</packaging>
-  <version>${moa-spss-version}</version>
+  <version>2.0.1</version>
   <name>MOA SP/SS Tools</name>
 
   <properties>
@@ -81,7 +81,7 @@
               </configuration>
           </plugin>
 
-<!--         		<plugin>
+        		<plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -98,7 +98,7 @@
           		          </configuration>
               		  </execution>
             		</executions>
-        		</plugin> -->
+        		</plugin>
         	</plugins>
        </build>
 </project>