git-svn-id: https://joinup.ec.europa.eu/svn/mocca/branches/mocca-1.2.11-sha2@600 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

60 files changed, 0 insertions, 9848 deletions

diff --git a/mocca-1.2.11/BKUOnline/catalog.xml b/mocca-1.2.11/BKUOnline/catalog.xml
deleted file mode 100644
index 38c98894..00000000
--- a/mocca-1.2.11/BKUOnline/catalog.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system">
-    <nextCatalog catalog="private/cache/retriever/catalog.xml"/>
-</catalog>
\ No newline at end of file
diff --git a/mocca-1.2.11/BKUOnline/nb-configuration.xml b/mocca-1.2.11/BKUOnline/nb-configuration.xml
deleted file mode 100644
index 4bfb3c58..00000000
--- a/mocca-1.2.11/BKUOnline/nb-configuration.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
-
-
-<spring-data xmlns="http://www.netbeans.org/ns/spring-data/1">
-        <config-files>
-            <config-file>src/main/webapp/WEB-INF/applicationContext.xml</config-file>
-        </config-files>
-        <config-file-groups/>
-    </spring-data>
-</project-shared-configuration>
diff --git a/mocca-1.2.11/BKUOnline/nbactions.xml b/mocca-1.2.11/BKUOnline/nbactions.xml
deleted file mode 100644
index e09cc3da..00000000
--- a/mocca-1.2.11/BKUOnline/nbactions.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actions>
-        <action>
-            <actionName>CUSTOM-Package_skipTest</actionName>
-            <displayName>Package_skipTest</displayName>
-            <goals>
-                <goal>package</goal>
-            </goals>
-            <properties>
-                <maven.test.skip>true</maven.test.skip>
-            </properties>
-        </action>
-    </actions>
diff --git a/mocca-1.2.11/BKUOnline/pom.xml b/mocca-1.2.11/BKUOnline/pom.xml
deleted file mode 100644
index fa3fa191..00000000
--- a/mocca-1.2.11/BKUOnline/pom.xml
+++ /dev/null
@@ -1,324 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-    <artifactId>bku</artifactId>
-    <groupId>at.gv.egiz</groupId>
-    <version>1.2.11</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>at.gv.egiz</groupId>
-  <artifactId>BKUOnline</artifactId>
-  <packaging>war</packaging>
-  <name>BKU Online</name>
-  <version>1.2.11</version>
-
-  <pluginRepositories>
-    <pluginRepository>
-      <id>tlc</id>
-      <name>TLC Repository</name>
-      <url>http://commons.ucalgary.ca/pub/m2</url>
-    </pluginRepository>
-  </pluginRepositories>
-
-  <dependencies>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>at.gv.egiz</groupId>
-      <artifactId>bkucommon</artifactId>
-      <version>1.2.11</version>
-    </dependency>
-    <dependency>
-      <groupId>at.gv.egiz</groupId>
-      <artifactId>BKUViewer</artifactId>
-      <version>1.2.11</version>
-    </dependency>
-    <dependency>
-      <artifactId>BKUCertificates</artifactId>
-      <groupId>at.gv.egiz</groupId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
-      <artifactId>BKUHelp</artifactId>
-      <groupId>at.gv.egiz</groupId>
-      <version>1.2.11</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>2.5.5</version>
-    </dependency>
-    <dependency>
-      <groupId>at.gv.egiz</groupId>
-      <artifactId>STALService</artifactId>
-      <version>1.2.11</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>at.gv.egiz</groupId>
-      <artifactId>STALService</artifactId>
-      <version>1.2.11</version>
-    </dependency>
-        <!--
-         |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
-         |   so that BKUOnline does not have to depend on STALXService
-         |-->
-    <dependency>
-      <groupId>at.gv.egiz</groupId>
-      <artifactId>STALXService</artifactId>
-      <version>1.2.11</version>
-    </dependency>
-		<!--
-         | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
-		-->
-    <dependency>
-      <groupId>com.sun.xml.ws</groupId>
-      <artifactId>jaxws-rt</artifactId>
-            <!-- use JAX-WS RI with SJSXP instead of Woodstox -->
-      <exclusions>
-        <exclusion>
-          <groupId>woodstox</groupId>
-          <artifactId>wstx-asl</artifactId>
-        </exclusion>
-      </exclusions>
-			<!--
-				conflict with SAAJ from java 6 ? <exclusions> <exclusion>
-				<groupId>javax.xml.soap</groupId> <artifactId>saaj-api</artifactId>
-				</exclusion> <exclusion>
-				<groupId>com.sun.xml.messaging.saaj</groupId>
-				<artifactId>saaj-impl</artifactId> </exclusion> </exclusions -->
-    </dependency>
-    <dependency>
-      <artifactId>sjsxp</artifactId>
-      <groupId>com.sun.xml.stream</groupId>
-      <version>1.0.1</version>
-    </dependency>
-        <!--
-         |   Applet-only dependencies (put in provided scope)
-         |   list to make them known to maven-dependency plugin
-         |   and make sure BKUApplet(Ext) is built prior to BKUOnline
-         |-->
-    <dependency>
-      <groupId>at.gv.egiz</groupId>
-      <artifactId>BKUApplet</artifactId>
-      <version>1.2.11</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>at.gv.egiz</groupId>
-      <artifactId>BKUAppletExt</artifactId>
-      <version>1.2.11</version>
-      <scope>provided</scope>
-    </dependency>
-    <!--
-     |   Transitive dependency from BKUViewer,
-     |   set excludeTransitive=false in unpack-fonts
-    <dependency>
-      <groupId>at.gv.egiz</groupId>
-      <artifactId>BKUFonts</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
-    </dependency-->
-    <dependency>
-      <groupId>iaik</groupId>
-      <artifactId>iaik_jce_me4se</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-  </dependencies>
-  <scm>
-    <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.11/BKUOnline</developerConnection>
-    <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.11/BKUOnline</connection>
-    <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.11/BKUOnline</url>
-  </scm>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <groupId>org.apache.maven.plugins</groupId>
-        <executions>
-          <execution>
-            <id>copy-applet</id>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/${project.build.finalName}/applet</outputDirectory>
-              <includeGroupIds>at.gv.egiz,commons-logging,iaik</includeGroupIds>
-              <includeArtifactIds>BKUApplet,BKUAppletExt,commons-logging,iaik_jce_me4se</includeArtifactIds>
-              <excludeTransitive>true</excludeTransitive>
-              <stripVersion>true</stripVersion>
-            </configuration>
-          </execution>
-          <execution>
-            <id>unpack-fonts</id>
-            <goals>
-              <goal>unpack-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/${project.build.finalName}/applet</outputDirectory>
-              <includeGroupIds>at.gv.egiz</includeGroupIds>
-              <includeArtifactIds>BKUFonts</includeArtifactIds>
-              <excludes>META-INF/,LICENSE</excludes>
-              <excludeTransitive>false</excludeTransitive>
-            </configuration>
-          </execution>
-          <execution>
-            <id>copy-certificates</id>
-            <goals>
-              <!-- unpack does not work with release:prepare -->
-              <goal>unpack-dependencies</goal>
-            </goals>
-            <configuration>
-              <includeArtifactIds>BKUCertificates</includeArtifactIds>
-              <includeGroupIds>at.gv.egiz</includeGroupIds>
-              <excludes>META-INF/</excludes>
-              <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
-            </configuration>
-          </execution>
-          <execution>
-            <id>copy-help</id>
-            <goals>
-              <goal>unpack-dependencies</goal>
-            </goals>
-            <configuration>
-              <includeArtifactIds>BKUHelp</includeArtifactIds>
-              <includeGroupIds>at.gv.egiz</includeGroupIds>
-              <excludes>META-INF/</excludes>
-              <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <manifest>
-            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-          </manifest>
-          <archive>
-            <manifestEntries>
-              <Implementation-Build>${project.version}-r${buildNumber}</Implementation-Build>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>maven-buildnumber-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>validate</phase>
-            <goals>
-              <goal>create</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <doCheck>false</doCheck>
-          <doUpdate>false</doUpdate>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <profiles>
-    <profile>
-      <id>jaxb-generate-stal</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>jaxws-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>wsimport</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <verbose>true</verbose>
-              <bindingDirectory>${basedir}/src/main/custom-binding</bindingDirectory>
-              <bindingFiles>
-                <bindingFile>stalservice-custom.xml</bindingFile>
-                <bindingFile>staltypes-custom.xml</bindingFile>
-                <bindingFile>cardchannel-custom.xml</bindingFile>
-              </bindingFiles>
-              <!-- wsdlDirectory>${basedir}/src/main/webapp/WEB-INF/wsdl</wsdlDirectory-->
-              <wsdlDirectory>${basedir}/src/main/wsdl</wsdlDirectory>
-              <wsdlFiles>
-                <wsdlFile>stal-service.wsdl</wsdlFile>
-              </wsdlFiles>
-              <sourceDestDir>${project.build.directory}/generated-sources/wsimport</sourceDestDir>
-              <staleFile>${project.build.directory}/generated-sources/wsimport/.staleFlag</staleFile>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>include-webstart</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <groupId>org.apache.maven.plugins</groupId>
-            <executions>
-              <execution>
-                <id>copy-webstart</id>
-                <goals>
-                  <goal>unpack-dependencies</goal>
-                </goals>
-                <configuration>
-                  <includeGroupIds>at.gv.egiz</includeGroupIds>
-                  <includeArtifactIds>BKUWebStart</includeArtifactIds>
-                  <outputDirectory>${project.build.directory}/${project.build.finalName}/webstart</outputDirectory>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-      <dependencies>
-        <!-- not yet available in IBIBLIO, install locally
-         |   NOT REQUIRED FOR BASIC DOWNLOAD PROTOCOL
-         |
-        <dependency>
-          <groupId>org.codehaus.mojo.webstart</groupId>
-          <artifactId>webstart-jnlp-servlet</artifactId>
-          <version>1.0-6.0.02_ea_b02.1-SNAPSHOT</version>
-        </dependency-->
-        <!-- dependency to ensure BKUWebStart is build prior to BKUOnline;
-         |   transitive dependencies shall not be included in WEB-INF/lib
-         |   and are provided in the BKUWebStart zip
-         |   (version defined in super-pom dependencyManagement, version won't be adjusted by release:prepare) -->
-        <dependency>
-          <groupId>at.gv.egiz</groupId>
-          <artifactId>BKUWebStart</artifactId>
-          <scope>provided</scope>
-          <type>zip</type>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-  <properties>
-    <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
-  </properties>
-</project>
diff --git a/mocca-1.2.11/BKUOnline/private/cache/retriever/catalog.xml b/mocca-1.2.11/BKUOnline/private/cache/retriever/catalog.xml
deleted file mode 100644
index c40b0d50..00000000
--- a/mocca-1.2.11/BKUOnline/private/cache/retriever/catalog.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system">
-    <system systemId="http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd" uri="java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd"/>
-    <system systemId="http://www.w3.org/2001/XMLSchema.xsd" uri="www.w3.org/2001/XMLSchema.xsd"/>
-</catalog>
\ No newline at end of file
diff --git a/mocca-1.2.11/BKUOnline/private/cache/retriever/java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd b/mocca-1.2.11/BKUOnline/private/cache/retriever/java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd
deleted file mode 100644
index f9a884c0..00000000
--- a/mocca-1.2.11/BKUOnline/private/cache/retriever/java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd
+++ /dev/null
@@ -1,362 +0,0 @@
-<?xml version = "1.0" encoding = "UTF-8"?>

-<xs:schema

-   targetNamespace = "http://java.sun.com/xml/ns/jaxb"

-   xmlns:jaxb = "http://java.sun.com/xml/ns/jaxb"

-   xmlns:xs = "http://www.w3.org/2001/XMLSchema"

-   elementFormDefault = "qualified"

-   attributeFormDefault = "unqualified">

-  <xs:annotation><xs:documentation>

-  Schema for JAXB 2.0 binding declarations.

-  </xs:documentation></xs:annotation>

-  <xs:group name = "declaration">

-    <xs:annotation><xs:documentation>

-Model group that represents a binding declaration. Each new binding

-declaration added to the jaxb namespace that is not restricted to 

-globalBindings should be added as a child element to this model group.

-    </xs:documentation></xs:annotation>

-    <!-- each new binding declaration, not restricted to

-           globalBindings, should be added here -->

-    <xs:choice>

-      <xs:element ref = "jaxb:globalBindings"/>

-      <xs:element ref = "jaxb:schemaBindings"/>

-      <xs:element ref = "jaxb:class"/>

-      <xs:element ref = "jaxb:property"/>

-      <xs:element ref = "jaxb:typesafeEnumClass"/>

-      <xs:element ref = "jaxb:typesafeEnumMember"/>

-      <xs:element ref = "jaxb:javaType"/>

-      <xs:element ref = "jaxb:dom"/>

-      <xs:element ref = "jaxb:inlineBinaryData"/>

-      <xs:any namespace = "##other" processContents = "lax"/>

-    </xs:choice>

-  </xs:group>

-  <xs:attribute name = "version" type="xs:token" >

-    <xs:annotation><xs:documentation>

-Used to specify the version of the binding schema on the schema element for 

-inline annotations or jaxb:bindings for external binding.

-    </xs:documentation></xs:annotation>

-  </xs:attribute>

-  <xs:attributeGroup name = "propertyAttributes">

-      <xs:annotation><xs:documentation>

-Attributes used for property customization. The attribute group can be 

-referenced either from the globalBindings declaration or from the 

-property declaration. The following defaults are defined by the JAXB

-specification in global scope only. Thus they apply when the 

-propertyAttributes group is referenced from the globalBindings declaration 

-but not when referenced from the property declaration.

-          collectionType            a class that implements java.util.List.

-          fixedAttributeAsConstantProperty  false

-          enableFailFastCheck        false

-          generateIsSetMethod        false

-	  optionalProperty           wrapper

-	  generateElementProperty    false

-          attachmentRef              default

-      </xs:documentation></xs:annotation>

-    <xs:attribute name = "collectionType" type="jaxb:referenceCollectionType"/>

-    <xs:attribute name = "fixedAttributeAsConstantProperty" type = "xs:boolean"/>

-    <xs:attribute name = "enableFailFastCheck" type = "xs:boolean"/>

-    <xs:attribute name = "generateIsSetMethod" type = "xs:boolean"/>

-    <xs:attribute name = "optionalProperty">

-	<xs:simpleType>

-	    <xs:restriction base="xs:NCName">

-		<xs:enumeration value="wrapper"/>

-		<xs:enumeration value="primitive"/>

-		<xs:enumeration value="isSet"/>

-	    </xs:restriction>

-	</xs:simpleType>

-    </xs:attribute>

-    <xs:attribute name = "generateElementProperty" type="xs:boolean"/>

-    <xs:attribute name = "attachmentRef">

-      <xs:simpleType>

-        <xs:restriction base="xs:NCName">

-	  <xs:enumeration value="resolve"/>

-	  <xs:enumeration value="doNotResolve"/>

-	  <xs:enumeration value="default"/>

-        </xs:restriction>

-      </xs:simpleType>

-   </xs:attribute>

-  </xs:attributeGroup>

-  <xs:attributeGroup name = "XMLNameToJavaIdMappingDefaults">

-    <xs:annotation><xs:documentation>Customize XMLNames to Java id mapping 

-    </xs:documentation></xs:annotation>

-    <xs:attribute name = "underscoreBinding" default = "asWordSeparator" type = "jaxb:underscoreBindingType"/>

-  </xs:attributeGroup>

-  <xs:attributeGroup name = "typesafeEnumClassDefaults">

-    <xs:attribute name = "typesafeEnumMemberName" default = "skipGeneration" type = "jaxb:typesafeEnumMemberNameType"/>

-    <xs:attribute name = "typesafeEnumBase" default = "xs:string" type = "jaxb:typesafeEnumBaseType"/>

-    <xs:attribute name = "typesafeEnumMaxMembers" type="xs:int" default="256"/>

-  </xs:attributeGroup>

-  <xs:element name = "globalBindings">

-      <xs:annotation><xs:documentation>Customization values defined in global scope.</xs:documentation></xs:annotation>

-    <xs:complexType>

-      <xs:sequence minOccurs = "0">

-        <xs:element ref = "jaxb:javaType" minOccurs = "0" maxOccurs = "unbounded"/>

-        <xs:element ref = "jaxb:serializable" minOccurs = "0"/>

-        <xs:any namespace = "##other" processContents = "lax">

-          <xs:annotation> <xs:documentation>allows extension binding declarations to be specified.</xs:documentation></xs:annotation>

-        </xs:any>

-      </xs:sequence>

-      <xs:attributeGroup ref = "jaxb:XMLNameToJavaIdMappingDefaults"/>

-      <xs:attributeGroup ref = "jaxb:typesafeEnumClassDefaults"/>

-      <xs:attributeGroup ref = "jaxb:propertyAttributes"/>

-      <xs:attribute name="generateValueClass" type="xs:boolean" 	

-		    default= "true"/>

-      <xs:attribute name="generateElementClass" type="xs:boolean" 	

-		    default= "false"/>

-      <xs:attribute name="mapSimpleTypeDef" type="xs:boolean" 	

-		    default= "false"/>

-      <xs:attribute name="localScoping" default= "nested">

-	<xs:simpleType>

-	   <xs:restriction base="xs:NCName">

-  		<xs:enumeration value="nested"/>

-		<xs:enumeration value="toplevel"/>

-           </xs:restriction>

-        </xs:simpleType>

-      </xs:attribute>

-      <xs:attribute name = "enableJavaNamingConventions" default = "true" type = "xs:boolean"/>

-<!--  Removed from JAXB 2.0

-      <xs:attribute name = "bindingStyle" default = "elementBinding" type = "jaxb:bindingStyleType"/>

--->

-      <xs:attribute name = "choiceContentProperty" default = "false" type = "xs:boolean"/>

-    </xs:complexType>

-  </xs:element>

-  <xs:element name = "schemaBindings">

-    <xs:annotation><xs:documentation>Customization values with schema scope</xs:documentation></xs:annotation>

-    <xs:complexType>

-      <xs:all>

-        <xs:element name = "package" type = "jaxb:packageType" minOccurs = "0"/>

-        <xs:element name = "nameXmlTransform" type = "jaxb:nameXmlTransformType" minOccurs = "0"/>

-      </xs:all>

-    </xs:complexType>

-  </xs:element>

-  <xs:element name = "class">

-    <xs:annotation><xs:documentation>Customize interface and implementation class.</xs:documentation></xs:annotation>

-    <xs:complexType>

-      <xs:sequence>

-        <xs:element name = "javadoc" type = "xs:string" minOccurs = "0"/>

-      </xs:sequence>

-      <xs:attribute name = "name" type = "jaxb:javaIdentifierType">

-        <xs:annotation><xs:documentation>Java class name without package prefix.</xs:documentation></xs:annotation>

-      </xs:attribute>

-      <xs:attribute name = "implClass" type = "jaxb:javaIdentifierType">

-        <xs:annotation><xs:documentation>Implementation class name including package prefix.</xs:documentation></xs:annotation>

-      </xs:attribute>

-      <xs:attribute name="generateValueClass" type="xs:boolean">

-        <xs:annotation><xs:documentation>Default value derived from [jaxb:globalBindings]@generateValueClass.</xs:documentation></xs:annotation>

-      </xs:attribute>

-    </xs:complexType>

-  </xs:element>

-  <xs:element name = "property">

-      <xs:annotation><xs:documentation>Customize property.</xs:documentation></xs:annotation>

-    <xs:complexType>

-      <xs:all>

-        <xs:element name = "javadoc" type = "xs:string" minOccurs="0"/>

-        <xs:element name = "baseType" type="jaxb:propertyBaseType" minOccurs="0"/>

-      </xs:all>

-      <xs:attribute name = "name" type = "jaxb:javaIdentifierType"/>

-      <xs:attributeGroup ref = "jaxb:propertyAttributes"/>

-    </xs:complexType>

-  </xs:element>

-  <xs:element name = "javaType">

-    <xs:annotation><xs:documentation>Data type conversions; overriding builtins</xs:documentation></xs:annotation>

-    <xs:complexType>

-      <xs:attribute name = "name" use = "required" type = "jaxb:javaIdentifierType">

-        <xs:annotation><xs:documentation>name of the java type to which xml type is to be bound.</xs:documentation></xs:annotation>

-      </xs:attribute>

-      <xs:attribute name = "xmlType" type = "xs:QName">

-        <xs:annotation><xs:documentation> xml type to which java datatype has to be bound.Must be present when javaType is scoped to globalBindings</xs:documentation></xs:annotation>

-      </xs:attribute>

-      <xs:attribute name = "parseMethod" type = "jaxb:javaIdentifierType"/>

-      <xs:attribute name = "printMethod" type = "jaxb:javaIdentifierType"/>

-      <xs:attribute name = "hasNsContext" default = "false" type = "xs:boolean" >

-        <xs:annotation><xs:documentation>

-If true, the parsMethod and printMethod must reference a method

-signtature that has a second parameter of type NamespaceContext.

-        </xs:documentation></xs:annotation>

-      </xs:attribute>

-    </xs:complexType>

-  </xs:element>

-  <xs:element name = "typesafeEnumClass">

-    <xs:annotation><xs:documentation> Bind to a type safe enumeration class.</xs:documentation></xs:annotation>

-    <xs:complexType>

-      <xs:sequence>

-        <xs:element name = "javadoc" type = "xs:string" minOccurs = "0"/>

-        <xs:element ref = "jaxb:typesafeEnumMember" minOccurs = "0" maxOccurs = "unbounded"/>

-      </xs:sequence>

-      <xs:attribute name = "name" type = "jaxb:javaIdentifierType"/>

-      <xs:attribute name = "map" type = "xs:boolean" default = "true"/>

-    </xs:complexType>

-  </xs:element>

-  <xs:element name = "typesafeEnumMember">

-    <xs:annotation><xs:documentation> Enumeration member name in a type safe enumeration class.</xs:documentation></xs:annotation>

-    <xs:complexType>

-      <xs:sequence>

-        <xs:element name = "javadoc" type = "xs:string" minOccurs = "0"/>

-      </xs:sequence>

-      <xs:attribute name = "value" type="xs:anySimpleType"/>

-      <xs:attribute name = "name" use = "required" type = "jaxb:javaIdentifierType"/>

-    </xs:complexType>

-  </xs:element>

-  

-  <!-- TYPE DEFINITIONS -->

-

-  <xs:complexType name = "propertyBaseType">

-    <xs:all>

-      <xs:element ref = "jaxb:javaType" minOccurs = "0"/>

-    </xs:all>

-      <xs:attribute name = "name" type = "jaxb:javaIdentifierType">

-        <xs:annotation><xs:documentation>

-The name attribute for [baseType] enables more precise control over the actual base type for a JAXB property. This customization enables specifying a more general base type than the property's default base type. The name attribute value must be a fully qualified Java class name. Additionally, this Java class must be a super interface/class of the default Java base type for the property. When the default base type is a primitive type, consider the default Java base type to be the Java wrapper class of that primitive type.This customization is useful to enable simple type substitution for a JAXB property representing with too restrictive of a default base type.

-        </xs:documentation></xs:annotation>

-      </xs:attribute>

-  </xs:complexType>

-

-<!-- Removed in JAXB 2.0. modelGroupBinding no longer exists.

-    <xs:simpleType name = "bindingStyleType">

-    <xs:annotation><xs:documentation>Allows selection of a binding algorithm</xs:documentation></xs:annotation>

-    <xs:restriction base = "xs:string">

-      <xs:enumeration value = "elementBinding"/>

-      <xs:enumeration value = "modelGroupBinding"/>

-    </xs:restriction>

-  </xs:simpleType>

--->

-  

-  <xs:complexType name = "packageType">

-    <xs:sequence>

-      <xs:element name = "javadoc" type = "xs:string" minOccurs = "0"/>

-    </xs:sequence>

-    <xs:attribute name = "name" type = "jaxb:javaIdentifierType"/>

-  </xs:complexType>

-  <xs:simpleType name = "underscoreBindingType">

-    <xs:annotation><xs:documentation>Treate underscore  in XML Name to Java identifier mapping.</xs:documentation></xs:annotation>

-    <xs:restriction base = "xs:string">

-      <xs:enumeration value = "asWordSeparator"/>

-      <xs:enumeration value = "asCharInWord"/>

-    </xs:restriction>

-  </xs:simpleType>

-  <xs:simpleType name = "typesafeEnumBaseType">

-    <xs:annotation><xs:documentation> 

-XML types or types derived from them which have enumeration facet(s) which are be mapped to typesafeEnumClass by default. The following types cannot be specified in this list: "xsd:QName", "xsd:base64Binary", "xsd:hexBinary", "xsd:date", "xsd:time", "xsd:dateTime", "xsd:duration","xsd:gDay", "xsd:gMonth", "xsd:Year", "xsd:gMonthDay", "xsd:YearMonth", "xsd:ID", "xsd:IDREF", "xsd:NOTATION"

-      </xs:documentation></xs:annotation>

-    <xs:list itemType = "xs:QName"/>

-  </xs:simpleType>

-  <xs:simpleType name = "typesafeEnumMemberNameType">

-    <xs:annotation><xs:documentation>Used to customize how to handle name collisions.</xs:documentation></xs:annotation>

-    <xs:restriction base = "xs:string">

-      <xs:enumeration value = "generateName"/>

-      <xs:enumeration value = "generateError"/>

-      <xs:enumeration value = "skipGeneration"/>

-    </xs:restriction>

-  </xs:simpleType>

-  <xs:simpleType name = "javaIdentifierType">

-    <xs:annotation><xs:documentation>Placeholder type to indicate Legal Java identifier.</xs:documentation></xs:annotation>

-    <xs:list itemType = "xs:NCName"/>

-  </xs:simpleType>

-  <xs:complexType name = "nameXmlTransformRule">

-    <xs:annotation><xs:documentation>Rule to transform an Xml name into another Xml name</xs:documentation></xs:annotation>

-    <xs:attribute name = "prefix" type = "xs:string">

-      <xs:annotation><xs:documentation>prepend the string to QName.</xs:documentation></xs:annotation>

-    </xs:attribute>

-    <xs:attribute name = "suffix" type = "xs:string">

-      <xs:annotation><xs:documentation>Append the string to QName.</xs:documentation></xs:annotation>

-    </xs:attribute>

-  </xs:complexType>

-  <xs:complexType name = "nameXmlTransformType">

-    <xs:annotation><xs:documentation>Allows transforming an xml name into another xml name. Use case UDDI 2.0 schema.</xs:documentation></xs:annotation>

-    <xs:all>

-      <xs:element name = "typeName" type = "jaxb:nameXmlTransformRule" minOccurs = "0">

-        <xs:annotation><xs:documentation>Mapping rule for type definitions.</xs:documentation></xs:annotation>

-      </xs:element>

-      <xs:element name = "elementName" type = "jaxb:nameXmlTransformRule" minOccurs = "0">

-        <xs:annotation><xs:documentation>Mapping rule for elements</xs:documentation></xs:annotation>

-      </xs:element>

-      <xs:element name = "modelGroupName" type = "jaxb:nameXmlTransformRule" minOccurs = "0">

-        <xs:annotation><xs:documentation>Mapping rule  for model group</xs:documentation></xs:annotation>

-      </xs:element>

-      <xs:element name = "anonymousTypeName" type = "jaxb:nameXmlTransformRule" minOccurs = "0">

-        <xs:annotation><xs:documentation>Mapping rule for class names generated for an anonymous type.</xs:documentation></xs:annotation>

-      </xs:element>

-    </xs:all>

-  </xs:complexType>

-  <xs:attribute name = "extensionBindingPrefixes">

-    <xs:annotation><xs:documentation>

-A binding compiler only processes this attribute when it occurs on an

-an instance of xs:schema element.  The value of this attribute is a

-whitespace-separated list of namespace prefixes.  The namespace bound

-to each of the prefixes is designated as a customization declaration

-namespace.</xs:documentation></xs:annotation>

-    <xs:simpleType>

-      <xs:list itemType = "xs:normalizedString"/>

-    </xs:simpleType>

-  </xs:attribute>

-  <xs:element name = "bindings">

-    <xs:annotation><xs:documentation>

-Binding declaration(s) for a remote schema.

-If attribute node is set, the binding declaraions

-are associated with part of the remote schema

-designated by schemaLocation attribute. The node

-attribute identifies the node in the remote schema

-to associate the binding declaration(s) with.

-      </xs:documentation></xs:annotation>

-    <!-- a <bindings> element can contain arbitrary number of binding declarations or nested <bindings> elements -->

-    <xs:complexType>

-      <xs:sequence>

-        <xs:choice minOccurs = "0" maxOccurs = "unbounded">

-          <xs:group ref = "jaxb:declaration"/>

-          <xs:element ref = "jaxb:bindings"/>

-        </xs:choice>

-      </xs:sequence>

-      <xs:attribute name = "schemaLocation" type = "xs:anyURI">

-        <xs:annotation><xs:documentation>

-Location of the remote schema to associate binding declarations with.

-        </xs:documentation></xs:annotation>

-      </xs:attribute>

-      <xs:attribute name = "node" type = "xs:string">

-        <xs:annotation><xs:documentation>

-The value of the string is an XPATH 1.0 compliant string that

-resolves to a node in a remote schema to associate

-binding declarations with. The remote schema is specified

-by the schemaLocation attribute occuring in the current

-element or in a parent of this element.

-        </xs:documentation></xs:annotation>

-      </xs:attribute>

-      <xs:attribute name = "version" type = "xs:token">

-        <xs:annotation><xs:documentation>

-Used to indicate the version of binding declarations. Only valid on root level bindings element. Either this or "jaxb:version" attribute but not both may be specified.

-        </xs:documentation></xs:annotation>

-      </xs:attribute>

-      <xs:attribute ref = "jaxb:version">

-        <xs:annotation><xs:documentation>

-Used to indicate the version of binding declarations. Only valid on root level bindings element. Either this attribute or "version" attribute but not both may be specified.</xs:documentation></xs:annotation>

-      </xs:attribute>

-    </xs:complexType>

-  </xs:element>

-  <xs:simpleType name="referenceCollectionType">

-    <xs:union>

-      <xs:simpleType>

-        <xs:restriction base="xs:string">

-          <xs:enumeration value="indexed"/>

-        </xs:restriction>

-      </xs:simpleType>

-      <xs:simpleType>

-        <xs:restriction base="jaxb:javaIdentifierType"/>

-      </xs:simpleType>

-    </xs:union>

-  </xs:simpleType> 

-  <xs:element name="dom">

-    <xs:complexType>

-	<xs:attribute name = "type" type="xs:NCName" default="w3c">

-          <xs:annotation><xs:documentation>Specify DOM API to bind to JAXB property to.</xs:documentation></xs:annotation>

-        </xs:attribute>

-    </xs:complexType>

-  </xs:element>

-  <xs:element name="inlineBinaryData">

-    <xs:annotation><xs:documentation>Disable MTOM/XOP encoding for this binary data. Annotation can be placed on a type defintion that derives from a W3C XSD binary data type or on an element that has a type that is or derives from a W3C XSD binary data type.</xs:documentation>

-    </xs:annotation>

-  </xs:element>

-  <xs:element name = "serializable">

-  <xs:complexType>

-    <xs:attribute name="uid" type="xs:long" default="1"/>

-    </xs:complexType>

-  </xs:element>

-</xs:schema>

-

diff --git a/mocca-1.2.11/BKUOnline/private/cache/retriever/www.w3.org/2001/XMLSchema.xsd b/mocca-1.2.11/BKUOnline/private/cache/retriever/www.w3.org/2001/XMLSchema.xsd
deleted file mode 100644
index 2e9a2729..00000000
--- a/mocca-1.2.11/BKUOnline/private/cache/retriever/www.w3.org/2001/XMLSchema.xsd
+++ /dev/null
@@ -1,2534 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- XML Schema schema for XML Schemas: Part 1: Structures -->
-<!-- Note this schema is NOT the normative structures schema. -->
-<!-- The prose copy in the structures REC is the normative -->
-<!-- version (which shouldn't differ from this one except for -->
-<!-- this comment and entity expansions, but just in case -->
-<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" [
-
-<!-- provide ID type information even for parsers which only read the
-     internal subset -->
-<!ATTLIST xs:schema          id  ID  #IMPLIED>
-<!ATTLIST xs:complexType     id  ID  #IMPLIED>
-<!ATTLIST xs:complexContent  id  ID  #IMPLIED>
-<!ATTLIST xs:simpleContent   id  ID  #IMPLIED>
-<!ATTLIST xs:extension       id  ID  #IMPLIED>
-<!ATTLIST xs:element         id  ID  #IMPLIED>
-<!ATTLIST xs:group           id  ID  #IMPLIED> 
-<!ATTLIST xs:all             id  ID  #IMPLIED>
-<!ATTLIST xs:choice          id  ID  #IMPLIED>
-<!ATTLIST xs:sequence        id  ID  #IMPLIED>
-<!ATTLIST xs:any             id  ID  #IMPLIED>
-<!ATTLIST xs:anyAttribute    id  ID  #IMPLIED>
-<!ATTLIST xs:attribute       id  ID  #IMPLIED>
-<!ATTLIST xs:attributeGroup  id  ID  #IMPLIED>
-<!ATTLIST xs:unique          id  ID  #IMPLIED>
-<!ATTLIST xs:key             id  ID  #IMPLIED>
-<!ATTLIST xs:keyref          id  ID  #IMPLIED>
-<!ATTLIST xs:selector        id  ID  #IMPLIED>
-<!ATTLIST xs:field           id  ID  #IMPLIED>
-<!ATTLIST xs:include         id  ID  #IMPLIED>
-<!ATTLIST xs:import          id  ID  #IMPLIED>
-<!ATTLIST xs:redefine        id  ID  #IMPLIED>
-<!ATTLIST xs:notation        id  ID  #IMPLIED>
-<!--
-     keep this schema XML1.0 DTD valid
-  -->
-        <!ENTITY % schemaAttrs 'xmlns:hfp CDATA #IMPLIED'>
-
-        <!ELEMENT hfp:hasFacet EMPTY>
-        <!ATTLIST hfp:hasFacet
-                name NMTOKEN #REQUIRED>
-
-        <!ELEMENT hfp:hasProperty EMPTY>
-        <!ATTLIST hfp:hasProperty
-                name NMTOKEN #REQUIRED
-                value CDATA #REQUIRED>
-<!--
-        Make sure that processors that do not read the external
-        subset will know about the various IDs we declare
-  -->
-        <!ATTLIST xs:simpleType id ID #IMPLIED>
-        <!ATTLIST xs:maxExclusive id ID #IMPLIED>
-        <!ATTLIST xs:minExclusive id ID #IMPLIED>
-        <!ATTLIST xs:maxInclusive id ID #IMPLIED>
-        <!ATTLIST xs:minInclusive id ID #IMPLIED>
-        <!ATTLIST xs:totalDigits id ID #IMPLIED>
-        <!ATTLIST xs:fractionDigits id ID #IMPLIED>
-        <!ATTLIST xs:length id ID #IMPLIED>
-        <!ATTLIST xs:minLength id ID #IMPLIED>
-        <!ATTLIST xs:maxLength id ID #IMPLIED>
-        <!ATTLIST xs:enumeration id ID #IMPLIED>
-        <!ATTLIST xs:pattern id ID #IMPLIED>
-        <!ATTLIST xs:appinfo id ID #IMPLIED>
-        <!ATTLIST xs:documentation id ID #IMPLIED>
-        <!ATTLIST xs:list id ID #IMPLIED>
-        <!ATTLIST xs:union id ID #IMPLIED>
-        ]>
-<xs:schema targetNamespace="http://www.w3.org/2001/XMLSchema" blockDefault="#all" elementFormDefault="qualified" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="EN" xmlns:hfp="http://www.w3.org/2001/XMLSchema-hasFacetAndProperty">
- <xs:annotation>
-  <xs:documentation>
-    Part 1 version: Id: structures.xsd,v 1.2 2004/01/15 11:34:25 ht Exp 
-    Part 2 version: Id: datatypes.xsd,v 1.3 2004/01/23 18:11:13 ht Exp 
-  </xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-   <xs:documentation source="http://www.w3.org/TR/2004/PER-xmlschema-1-20040318/structures.html">
-   The schema corresponding to this document is normative,
-   with respect to the syntactic constraints it expresses in the
-   XML Schema language.  The documentation (within &lt;documentation> elements)
-   below, is not normative, but rather highlights important aspects of
-   the W3C Recommendation of which this is a part</xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-   <xs:documentation>
-   The simpleType element and all of its members are defined
-      towards the end of this schema document</xs:documentation>
- </xs:annotation>
-
- <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd">
-   <xs:annotation>
-     <xs:documentation>
-       Get access to the xml: attribute groups for xml:lang
-       as declared on 'schema' and 'documentation' below
-     </xs:documentation>
-   </xs:annotation>
- </xs:import>
-
- <xs:complexType name="openAttrs">
-   <xs:annotation>
-     <xs:documentation>
-       This type is extended by almost all schema types
-       to allow attributes from other namespaces to be
-       added to user schemas.
-     </xs:documentation>
-   </xs:annotation>
-   <xs:complexContent>
-     <xs:restriction base="xs:anyType">
-       <xs:anyAttribute namespace="##other" processContents="lax"/>
-     </xs:restriction>
-   </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="annotated">
-   <xs:annotation>
-     <xs:documentation>
-       This type is extended by all types which allow annotation
-       other than &lt;schema&gt; itself
-     </xs:documentation>
-   </xs:annotation>
-   <xs:complexContent>
-     <xs:extension base="xs:openAttrs">
-       <xs:sequence>
-         <xs:element ref="xs:annotation" minOccurs="0"/>
-       </xs:sequence>
-       <xs:attribute name="id" type="xs:ID"/>
-     </xs:extension>
-   </xs:complexContent>
- </xs:complexType>
-
- <xs:group name="schemaTop">
-  <xs:annotation>
-   <xs:documentation>
-   This group is for the
-   elements which occur freely at the top level of schemas.
-   All of their types are based on the "annotated" type by extension.</xs:documentation>
-  </xs:annotation>
-  <xs:choice>
-   <xs:group ref="xs:redefinable"/>
-   <xs:element ref="xs:element"/>
-   <xs:element ref="xs:attribute"/>
-   <xs:element ref="xs:notation"/>
-  </xs:choice>
- </xs:group>
- 
- <xs:group name="redefinable">
-  <xs:annotation>
-   <xs:documentation>
-   This group is for the
-   elements which can self-redefine (see &lt;redefine> below).</xs:documentation>
-  </xs:annotation>
-  <xs:choice>
-   <xs:element ref="xs:simpleType"/>
-   <xs:element ref="xs:complexType"/>
-   <xs:element ref="xs:group"/>
-   <xs:element ref="xs:attributeGroup"/>
-  </xs:choice>
- </xs:group>
-
- <xs:simpleType name="formChoice">
-  <xs:annotation>
-   <xs:documentation>
-   A utility type, not for public use</xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:NMTOKEN">
-   <xs:enumeration value="qualified"/>
-   <xs:enumeration value="unqualified"/>
-  </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="reducedDerivationControl">
-  <xs:annotation>
-   <xs:documentation>
-   A utility type, not for public use</xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:derivationControl">
-   <xs:enumeration value="extension"/>
-   <xs:enumeration value="restriction"/>
-  </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="derivationSet">
-  <xs:annotation>
-   <xs:documentation>
-   A utility type, not for public use</xs:documentation>
-   <xs:documentation>
-   #all or (possibly empty) subset of {extension, restriction}</xs:documentation>
-  </xs:annotation>
-  <xs:union>
-   <xs:simpleType>    
-    <xs:restriction base="xs:token">
-     <xs:enumeration value="#all"/>
-    </xs:restriction>
-   </xs:simpleType>
-   <xs:simpleType>
-    <xs:list itemType="xs:reducedDerivationControl"/>
-   </xs:simpleType>
-  </xs:union>
- </xs:simpleType>
-
- <xs:simpleType name="typeDerivationControl">
-  <xs:annotation>
-   <xs:documentation>
-   A utility type, not for public use</xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:derivationControl">
-   <xs:enumeration value="extension"/>
-   <xs:enumeration value="restriction"/>
-   <xs:enumeration value="list"/>
-   <xs:enumeration value="union"/>
-  </xs:restriction>
- </xs:simpleType>
-
-  <xs:simpleType name="fullDerivationSet">
-  <xs:annotation>
-   <xs:documentation>
-   A utility type, not for public use</xs:documentation>
-   <xs:documentation>
-   #all or (possibly empty) subset of {extension, restriction, list, union}</xs:documentation>
-  </xs:annotation>
-  <xs:union>
-   <xs:simpleType>    
-    <xs:restriction base="xs:token">
-     <xs:enumeration value="#all"/>
-    </xs:restriction>
-   </xs:simpleType>
-   <xs:simpleType>
-    <xs:list itemType="xs:typeDerivationControl"/>
-   </xs:simpleType>
-  </xs:union>
- </xs:simpleType>
-
- <xs:element name="schema" id="schema">
-  <xs:annotation>
-    <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-schema"/>
-  </xs:annotation>
-  <xs:complexType>
-   <xs:complexContent>
-    <xs:extension base="xs:openAttrs">
-     <xs:sequence>
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-       <xs:element ref="xs:include"/>
-       <xs:element ref="xs:import"/>
-       <xs:element ref="xs:redefine"/>
-       <xs:element ref="xs:annotation"/>
-      </xs:choice>
-      <xs:sequence minOccurs="0" maxOccurs="unbounded">
-       <xs:group ref="xs:schemaTop"/>
-       <xs:element ref="xs:annotation" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-     </xs:sequence>
-     <xs:attribute name="targetNamespace" type="xs:anyURI"/>
-     <xs:attribute name="version" type="xs:token"/>
-     <xs:attribute name="finalDefault" type="xs:fullDerivationSet" use="optional" default=""/>
-     <xs:attribute name="blockDefault" type="xs:blockSet" use="optional" default=""/>
-     <xs:attribute name="attributeFormDefault" type="xs:formChoice" use="optional" default="unqualified"/>
-     <xs:attribute name="elementFormDefault" type="xs:formChoice" use="optional" default="unqualified"/>
-     <xs:attribute name="id" type="xs:ID"/>
-     <xs:attribute ref="xml:lang"/>
-    </xs:extension>
-   </xs:complexContent>
-  </xs:complexType>
-
-  <xs:key name="element">
-   <xs:selector xpath="xs:element"/>
-   <xs:field xpath="@name"/>
-  </xs:key>
-
-  <xs:key name="attribute">
-   <xs:selector xpath="xs:attribute"/>
-   <xs:field xpath="@name"/>
-  </xs:key>
-
-  <xs:key name="type">
-   <xs:selector xpath="xs:complexType|xs:simpleType"/>
-   <xs:field xpath="@name"/>
-  </xs:key>
- 
-  <xs:key name="group">
-   <xs:selector xpath="xs:group"/>
-   <xs:field xpath="@name"/>
-  </xs:key>
- 
-  <xs:key name="attributeGroup">
-   <xs:selector xpath="xs:attributeGroup"/>
-   <xs:field xpath="@name"/>
-  </xs:key>
- 
-  <xs:key name="notation">
-   <xs:selector xpath="xs:notation"/>
-   <xs:field xpath="@name"/>
-  </xs:key>
-
-  <xs:key name="identityConstraint">
-   <xs:selector xpath=".//xs:key|.//xs:unique|.//xs:keyref"/>
-   <xs:field xpath="@name"/>
-  </xs:key>
-
- </xs:element>
-
- <xs:simpleType name="allNNI">
-  <xs:annotation><xs:documentation>
-   for maxOccurs</xs:documentation></xs:annotation>
-  <xs:union memberTypes="xs:nonNegativeInteger">
-   <xs:simpleType>
-    <xs:restriction base="xs:NMTOKEN">
-     <xs:enumeration value="unbounded"/>
-    </xs:restriction>
-   </xs:simpleType>
-  </xs:union>
- </xs:simpleType>
-
- <xs:attributeGroup name="occurs">
-  <xs:annotation><xs:documentation>
-   for all particles</xs:documentation></xs:annotation>
-  <xs:attribute name="minOccurs" type="xs:nonNegativeInteger" use="optional" default="1"/>
-  <xs:attribute name="maxOccurs" type="xs:allNNI" use="optional" default="1"/>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="defRef">
-  <xs:annotation><xs:documentation>
-   for element, group and attributeGroup,
-   which both define and reference</xs:documentation></xs:annotation>
-  <xs:attribute name="name" type="xs:NCName"/>
-  <xs:attribute name="ref" type="xs:QName"/>
- </xs:attributeGroup>
-
- <xs:group name="typeDefParticle">
-  <xs:annotation>
-    <xs:documentation>
-   'complexType' uses this</xs:documentation></xs:annotation>
-  <xs:choice>
-   <xs:element name="group" type="xs:groupRef"/>
-   <xs:element ref="xs:all"/>
-   <xs:element ref="xs:choice"/>
-   <xs:element ref="xs:sequence"/>
-  </xs:choice>
- </xs:group>
- 
- 
-
- <xs:group name="nestedParticle">
-  <xs:choice>
-   <xs:element name="element" type="xs:localElement"/>
-   <xs:element name="group" type="xs:groupRef"/>
-   <xs:element ref="xs:choice"/>
-   <xs:element ref="xs:sequence"/>
-   <xs:element ref="xs:any"/>
-  </xs:choice>
- </xs:group>
- 
- <xs:group name="particle">
-  <xs:choice>
-   <xs:element name="element" type="xs:localElement"/>
-   <xs:element name="group" type="xs:groupRef"/>
-   <xs:element ref="xs:all"/>
-   <xs:element ref="xs:choice"/>
-   <xs:element ref="xs:sequence"/>
-   <xs:element ref="xs:any"/>
-  </xs:choice>
- </xs:group>
- 
- <xs:complexType name="attribute">
-  <xs:complexContent>
-   <xs:extension base="xs:annotated">
-    <xs:sequence>
-     <xs:element name="simpleType" minOccurs="0" type="xs:localSimpleType"/>
-    </xs:sequence>
-    <xs:attributeGroup ref="xs:defRef"/>
-    <xs:attribute name="type" type="xs:QName"/>
-    <xs:attribute name="use" use="optional" default="optional">
-     <xs:simpleType>
-      <xs:restriction base="xs:NMTOKEN">
-       <xs:enumeration value="prohibited"/>
-       <xs:enumeration value="optional"/>
-       <xs:enumeration value="required"/>
-      </xs:restriction>
-     </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="default" type="xs:string"/>
-    <xs:attribute name="fixed" type="xs:string"/>
-    <xs:attribute name="form" type="xs:formChoice"/>
-   </xs:extension>
-  </xs:complexContent>
- </xs:complexType>
- 
- <xs:complexType name="topLevelAttribute">
-  <xs:complexContent>
-   <xs:restriction base="xs:attribute">
-    <xs:sequence>
-     <xs:element ref="xs:annotation" minOccurs="0"/>
-     <xs:element name="simpleType" minOccurs="0" type="xs:localSimpleType"/>
-    </xs:sequence>
-    <xs:attribute name="ref" use="prohibited"/>
-    <xs:attribute name="form" use="prohibited"/>
-    <xs:attribute name="use" use="prohibited"/>
-    <xs:attribute name="name" use="required" type="xs:NCName"/>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-   </xs:restriction>
-  </xs:complexContent>
- </xs:complexType>
-
- <xs:group name="attrDecls">
-  <xs:sequence>
-   <xs:choice minOccurs="0" maxOccurs="unbounded">
-    <xs:element name="attribute" type="xs:attribute"/>
-    <xs:element name="attributeGroup" type="xs:attributeGroupRef"/>
-   </xs:choice>
-   <xs:element ref="xs:anyAttribute" minOccurs="0"/>
-  </xs:sequence>
- </xs:group>
-
- <xs:element name="anyAttribute" type="xs:wildcard" id="anyAttribute">
-  <xs:annotation>
-   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-anyAttribute"/>
-  </xs:annotation>
- </xs:element>
-
- <xs:group name="complexTypeModel">
-  <xs:choice>
-      <xs:element ref="xs:simpleContent"/>
-      <xs:element ref="xs:complexContent"/>
-      <xs:sequence>
-       <xs:annotation>
-        <xs:documentation>
-   This branch is short for
-   &lt;complexContent>
-   &lt;restriction base="xs:anyType">
-   ...
-   &lt;/restriction>
-   &lt;/complexContent></xs:documentation>
-       </xs:annotation>
-       <xs:group ref="xs:typeDefParticle" minOccurs="0"/>
-       <xs:group ref="xs:attrDecls"/>
-      </xs:sequence>
-  </xs:choice>
- </xs:group>
-
- <xs:complexType name="complexType" abstract="true">
-  <xs:complexContent>
-   <xs:extension base="xs:annotated">
-    <xs:group ref="xs:complexTypeModel"/>
-    <xs:attribute name="name" type="xs:NCName">
-     <xs:annotation>
-      <xs:documentation>
-      Will be restricted to required or forbidden</xs:documentation>
-     </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="mixed" type="xs:boolean" use="optional" default="false">
-     <xs:annotation>
-      <xs:documentation>
-      Not allowed if simpleContent child is chosen.
-      May be overriden by setting on complexContent child.</xs:documentation>
-    </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="abstract" type="xs:boolean" use="optional" default="false"/>
-    <xs:attribute name="final" type="xs:derivationSet"/>
-    <xs:attribute name="block" type="xs:derivationSet"/>
-   </xs:extension>
-  </xs:complexContent>
- </xs:complexType>
- 
- <xs:complexType name="topLevelComplexType">
-  <xs:complexContent>
-   <xs:restriction base="xs:complexType">
-    <xs:sequence>
-     <xs:element ref="xs:annotation" minOccurs="0"/>
-     <xs:group ref="xs:complexTypeModel"/>
-    </xs:sequence>
-    <xs:attribute name="name" type="xs:NCName" use="required"/>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-   </xs:restriction>
-  </xs:complexContent>
- </xs:complexType>
- 
- <xs:complexType name="localComplexType">
-  <xs:complexContent>
-   <xs:restriction base="xs:complexType">
-    <xs:sequence>
-     <xs:element ref="xs:annotation" minOccurs="0"/>
-     <xs:group ref="xs:complexTypeModel"/>
-    </xs:sequence>
-    <xs:attribute name="name" use="prohibited"/>
-    <xs:attribute name="abstract" use="prohibited"/>
-    <xs:attribute name="final" use="prohibited"/>
-    <xs:attribute name="block" use="prohibited"/>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-   </xs:restriction>
-  </xs:complexContent>
- </xs:complexType>
- 
- <xs:complexType name="restrictionType">
-  <xs:complexContent>
-   <xs:extension base="xs:annotated">
-    <xs:sequence>
-     <xs:choice minOccurs="0">
-      <xs:group ref="xs:typeDefParticle"/>
-      <xs:group ref="xs:simpleRestrictionModel"/>
-     </xs:choice>
-     <xs:group ref="xs:attrDecls"/>
-    </xs:sequence>
-    <xs:attribute name="base" type="xs:QName" use="required"/>
-   </xs:extension>
-  </xs:complexContent>       
- </xs:complexType>
-
- <xs:complexType name="complexRestrictionType">
-  <xs:complexContent>
-   <xs:restriction base="xs:restrictionType">
-    <xs:sequence>
-     <xs:element ref="xs:annotation" minOccurs="0"/>
-     <xs:choice minOccurs="0">
-      <xs:annotation>
-       <xs:documentation>This choice is added simply to
-                   make this a valid restriction per the REC</xs:documentation>
-      </xs:annotation>
-      <xs:group ref="xs:typeDefParticle"/>
-     </xs:choice>
-     <xs:group ref="xs:attrDecls"/>
-    </xs:sequence>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-   </xs:restriction>
-  </xs:complexContent>       
- </xs:complexType>
-
- <xs:complexType name="extensionType">
-  <xs:complexContent>
-   <xs:extension base="xs:annotated">
-    <xs:sequence>
-     <xs:group ref="xs:typeDefParticle" minOccurs="0"/>
-     <xs:group ref="xs:attrDecls"/>
-    </xs:sequence>
-    <xs:attribute name="base" type="xs:QName" use="required"/>
-   </xs:extension>
-  </xs:complexContent>       
- </xs:complexType>
-
- <xs:element name="complexContent" id="complexContent">
-  <xs:annotation>
-   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-complexContent"/>
-  </xs:annotation>
-  <xs:complexType>
-   <xs:complexContent>
-    <xs:extension base="xs:annotated">
-     <xs:choice>
-      <xs:element name="restriction" type="xs:complexRestrictionType"/>
-      <xs:element name="extension" type="xs:extensionType"/>
-     </xs:choice>     
-     <xs:attribute name="mixed" type="xs:boolean">
-      <xs:annotation>
-       <xs:documentation>
-       Overrides any setting on complexType parent.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    </xs:extension>
-   </xs:complexContent>
-  </xs:complexType>
- </xs:element>
-
- <xs:complexType name="simpleRestrictionType">
-  <xs:complexContent>
-   <xs:restriction base="xs:restrictionType">
-    <xs:sequence>
-     <xs:element ref="xs:annotation" minOccurs="0"/>
-     <xs:choice minOccurs="0">
-      <xs:annotation>
-       <xs:documentation>This choice is added simply to
-                   make this a valid restriction per the REC</xs:documentation>
-      </xs:annotation>
-      <xs:group ref="xs:simpleRestrictionModel"/>
-     </xs:choice>
-     <xs:group ref="xs:attrDecls"/>
-    </xs:sequence>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-   </xs:restriction>
-  </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="simpleExtensionType">
-  <xs:complexContent>
-   <xs:restriction base="xs:extensionType">
-    <xs:sequence>
-     <xs:annotation>
-      <xs:documentation>
-      No typeDefParticle group reference</xs:documentation>
-     </xs:annotation>
-     <xs:element ref="xs:annotation" minOccurs="0"/>
-     <xs:group ref="xs:attrDecls"/>
-    </xs:sequence>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-   </xs:restriction>
-  </xs:complexContent>
- </xs:complexType>
-
- <xs:element name="simpleContent" id="simpleContent">
-  <xs:annotation>
-   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-simpleContent"/>
-  </xs:annotation>
-  <xs:complexType>
-   <xs:complexContent>
-    <xs:extension base="xs:annotated">
-     <xs:choice>
-      <xs:element name="restriction" type="xs:simpleRestrictionType"/>
-      <xs:element name="extension" type="xs:simpleExtensionType"/>
-     </xs:choice>
-    </xs:extension>
-   </xs:complexContent>
-  </xs:complexType>
- </xs:element>
- 
- <xs:element name="complexType" type="xs:topLevelComplexType" id="complexType">
-  <xs:annotation>
-   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-complexType"/>
-  </xs:annotation>
- </xs:element>
-
-
-  <xs:simpleType name="blockSet">
-   <xs:annotation>
-    <xs:documentation>
-    A utility type, not for public use</xs:documentation>
-    <xs:documentation>
-    #all or (possibly empty) subset of {substitution, extension,
-    restriction}</xs:documentation>
-   </xs:annotation>
-   <xs:union>
-    <xs:simpleType>    
-     <xs:restriction base="xs:token">
-      <xs:enumeration value="#all"/>
-     </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType>
-     <xs:list>
-      <xs:simpleType>
-       <xs:restriction base="xs:derivationControl">
-        <xs:enumeration value="extension"/>
-        <xs:enumeration value="restriction"/>
-        <xs:enumeration value="substitution"/>
-       </xs:restriction>
-      </xs:simpleType>
-     </xs:list>
-    </xs:simpleType>
-   </xs:union>  
-  </xs:simpleType>
-
- <xs:complexType name="element" abstract="true">
-  <xs:annotation>
-   <xs:documentation>
-   The element element can be used either
-   at the top level to define an element-type binding globally,
-   or within a content model to either reference a globally-defined
-   element or type or declare an element-type binding locally.
-   The ref form is not allowed at the top level.</xs:documentation>
-  </xs:annotation>
-
-  <xs:complexContent>
-   <xs:extension base="xs:annotated">
-    <xs:sequence>
-     <xs:choice minOccurs="0">
-      <xs:element name="simpleType" type="xs:localSimpleType"/>
-      <xs:element name="complexType" type="xs:localComplexType"/>
-     </xs:choice>
-     <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attributeGroup ref="xs:defRef"/>
-    <xs:attribute name="type" type="xs:QName"/>
-    <xs:attribute name="substitutionGroup" type="xs:QName"/>
-    <xs:attributeGroup ref="xs:occurs"/>
-    <xs:attribute name="default" type="xs:string"/>
-    <xs:attribute name="fixed" type="xs:string"/>
-    <xs:attribute name="nillable" type="xs:boolean" use="optional" default="false"/>
-    <xs:attribute name="abstract" type="xs:boolean" use="optional" default="false"/>
-    <xs:attribute name="final" type="xs:derivationSet"/>
-    <xs:attribute name="block" type="xs:blockSet"/>
-    <xs:attribute name="form" type="xs:formChoice"/>
-   </xs:extension>
-  </xs:complexContent>
- </xs:complexType>
- 
- <xs:complexType name="topLevelElement">
-  <xs:complexContent>
-   <xs:restriction base="xs:element">
-    <xs:sequence>
-     <xs:element ref="xs:annotation" minOccurs="0"/>
-     <xs:choice minOccurs="0">
-      <xs:element name="simpleType" type="xs:localSimpleType"/>
-      <xs:element name="complexType" type="xs:localComplexType"/>
-     </xs:choice>
-     <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attribute name="ref" use="prohibited"/>
-    <xs:attribute name="form" use="prohibited"/>
-    <xs:attribute name="minOccurs" use="prohibited"/>
-    <xs:attribute name="maxOccurs" use="prohibited"/>
-    <xs:attribute name="name" use="required" type="xs:NCName"/>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-   </xs:restriction>
-  </xs:complexContent>
- </xs:complexType>
- 
- <xs:complexType name="localElement">
-  <xs:complexContent>
-   <xs:restriction base="xs:element">
-    <xs:sequence>
-     <xs:element ref="xs:annotation" minOccurs="0"/>
-     <xs:choice minOccurs="0">
-      <xs:element name="simpleType" type="xs:localSimpleType"/>
-      <xs:element name="complexType" type="xs:localComplexType"/>
-     </xs:choice>
-     <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attribute name="substitutionGroup" use="prohibited"/>
-    <xs:attribute name="final" use="prohibited"/>
-    <xs:attribute name="abstract" use="prohibited"/>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-   </xs:restriction>
-  </xs:complexContent>
- </xs:complexType>
-
- <xs:element name="element" type="xs:topLevelElement" id="element">
-  <xs:annotation>
-   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-element"/>
-  </xs:annotation>
- </xs:element>
-
- <xs:complexType name="group" abstract="true">
-  <xs:annotation>
-   <xs:documentation>
-   group type for explicit groups, named top-level groups and
-   group references</xs:documentation>
-  </xs:annotation>
-  <xs:complexContent>
-   <xs:extension base="xs:annotated">
-    <xs:group ref="xs:particle" minOccurs="0" maxOccurs="unbounded"/>
-    <xs:attributeGroup ref="xs:defRef"/>
-    <xs:attributeGroup ref="xs:occurs"/>
-   </xs:extension>
-  </xs:complexContent>
- </xs:complexType>
- 
- <xs:complexType name="realGroup">
-  <xs:complexContent>
-   <xs:restriction base="xs:group">
-    <xs:sequence>
-     <xs:element ref="xs:annotation" minOccurs="0"/>
-     <xs:choice minOccurs="0" maxOccurs="1">
-      <xs:element ref="xs:all"/>
-      <xs:element ref="xs:choice"/>
-      <xs:element ref="xs:sequence"/>
-     </xs:choice>
-    </xs:sequence>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-   </xs:restriction>
-  </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="namedGroup">
-  <xs:complexContent>
-   <xs:restriction base="xs:realGroup">
-    <xs:sequence>
-     <xs:element ref="xs:annotation" minOccurs="0"/>
-     <xs:choice minOccurs="1" maxOccurs="1">
-      <xs:element name="all">
-       <xs:complexType>
-        <xs:complexContent>
-         <xs:restriction base="xs:all">
-          <xs:group ref="xs:allModel"/>
-          <xs:attribute name="minOccurs" use="prohibited"/>
-          <xs:attribute name="maxOccurs" use="prohibited"/>
-          <xs:anyAttribute namespace="##other" processContents="lax"/>
-         </xs:restriction>
-        </xs:complexContent>
-       </xs:complexType>
-      </xs:element>
-      <xs:element name="choice" type="xs:simpleExplicitGroup"/>
-      <xs:element name="sequence" type="xs:simpleExplicitGroup"/>
-     </xs:choice>
-    </xs:sequence>
-    <xs:attribute name="name" use="required" type="xs:NCName"/>
-    <xs:attribute name="ref" use="prohibited"/>
-    <xs:attribute name="minOccurs" use="prohibited"/>
-    <xs:attribute name="maxOccurs" use="prohibited"/>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-   </xs:restriction>
-  </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="groupRef">
-  <xs:complexContent>
-   <xs:restriction base="xs:realGroup">
-    <xs:sequence>
-     <xs:element ref="xs:annotation" minOccurs="0"/>
-    </xs:sequence>
-    <xs:attribute name="ref" use="required" type="xs:QName"/>
-    <xs:attribute name="name" use="prohibited"/>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-   </xs:restriction>
-  </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="explicitGroup">
-  <xs:annotation>
-   <xs:documentation>
-   group type for the three kinds of group</xs:documentation>
-  </xs:annotation>
-  <xs:complexContent>
-   <xs:restriction base="xs:group">
-    <xs:sequence>
-     <xs:element ref="xs:annotation" minOccurs="0"/>
-     <xs:group ref="xs:nestedParticle" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attribute name="name" type="xs:NCName" use="prohibited"/>
-    <xs:attribute name="ref" type="xs:QName" use="prohibited"/>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-   </xs:restriction>
-  </xs:complexContent>
- </xs:complexType>
- 
- <xs:complexType name="simpleExplicitGroup">
-  <xs:complexContent>
-   <xs:restriction base="xs:explicitGroup">
-    <xs:sequence>
-     <xs:element ref="xs:annotation" minOccurs="0"/>
-     <xs:group ref="xs:nestedParticle" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attribute name="minOccurs" use="prohibited"/>
-    <xs:attribute name="maxOccurs" use="prohibited"/>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-   </xs:restriction>
-  </xs:complexContent>
- </xs:complexType>
- 
- <xs:group name="allModel">
-  <xs:sequence>
-      <xs:element ref="xs:annotation" minOccurs="0"/>
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-       <xs:annotation>
-        <xs:documentation>This choice with min/max is here to
-                          avoid a pblm with the Elt:All/Choice/Seq
-                          Particle derivation constraint</xs:documentation>
-       </xs:annotation>
-       <xs:element name="element" type="xs:narrowMaxMin"/>
-      </xs:choice>
-     </xs:sequence>
- </xs:group>
- 
- 
- <xs:complexType name="narrowMaxMin">
-  <xs:annotation>
-   <xs:documentation>restricted max/min</xs:documentation>
-  </xs:annotation>
-  <xs:complexContent>
-   <xs:restriction base="xs:localElement">
-    <xs:sequence>
-     <xs:element ref="xs:annotation" minOccurs="0"/>
-     <xs:choice minOccurs="0">
-      <xs:element name="simpleType" type="xs:localSimpleType"/>
-      <xs:element name="complexType" type="xs:localComplexType"/>
-     </xs:choice>
-     <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attribute name="minOccurs" use="optional" default="1">
-     <xs:simpleType>
-      <xs:restriction base="xs:nonNegativeInteger">
-       <xs:enumeration value="0"/>
-       <xs:enumeration value="1"/>
-      </xs:restriction>
-     </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="maxOccurs" use="optional" default="1">
-     <xs:simpleType>
-      <xs:restriction base="xs:allNNI">
-       <xs:enumeration value="0"/>
-       <xs:enumeration value="1"/>
-      </xs:restriction>
-     </xs:simpleType>
-    </xs:attribute>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-   </xs:restriction>
-  </xs:complexContent>
- </xs:complexType>
-
-  <xs:complexType name="all">
-   <xs:annotation>
-    <xs:documentation>
-   Only elements allowed inside</xs:documentation>
-   </xs:annotation>
-   <xs:complexContent>
-    <xs:restriction base="xs:explicitGroup">
-     <xs:group ref="xs:allModel"/>
-     <xs:attribute name="minOccurs" use="optional" default="1">
-      <xs:simpleType>
-       <xs:restriction base="xs:nonNegativeInteger">
-        <xs:enumeration value="0"/>
-        <xs:enumeration value="1"/>
-       </xs:restriction>
-      </xs:simpleType>
-     </xs:attribute>
-     <xs:attribute name="maxOccurs" use="optional" default="1">
-      <xs:simpleType>
-       <xs:restriction base="xs:allNNI">
-        <xs:enumeration value="1"/>
-       </xs:restriction>
-      </xs:simpleType>
-     </xs:attribute>
-     <xs:anyAttribute namespace="##other" processContents="lax"/>
-    </xs:restriction>
-   </xs:complexContent>
-  </xs:complexType>
-
- <xs:element name="all" id="all" type="xs:all">
-  <xs:annotation>
-   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-all"/>
-  </xs:annotation>
- </xs:element>
-
- <xs:element name="choice" type="xs:explicitGroup" id="choice">
-  <xs:annotation>
-   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-choice"/>
-  </xs:annotation>
- </xs:element>
-
- <xs:element name="sequence" type="xs:explicitGroup" id="sequence">
-  <xs:annotation>
-   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-sequence"/>
-  </xs:annotation>
- </xs:element>
-
- <xs:element name="group" type="xs:namedGroup" id="group">
-  <xs:annotation>
-   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-group"/>
-  </xs:annotation>
- </xs:element>
-
- <xs:complexType name="wildcard">
-  <xs:complexContent>
-   <xs:extension base="xs:annotated">
-    <xs:attribute name="namespace" type="xs:namespaceList" use="optional" default="##any"/>
-    <xs:attribute name="processContents" use="optional" default="strict">
-     <xs:simpleType>
-      <xs:restriction base="xs:NMTOKEN">
-       <xs:enumeration value="skip"/>
-       <xs:enumeration value="lax"/>
-       <xs:enumeration value="strict"/>
-      </xs:restriction>
-     </xs:simpleType>
-    </xs:attribute>
-   </xs:extension>
-  </xs:complexContent>
- </xs:complexType>
-
- <xs:element name="any" id="any">
-  <xs:annotation>
-   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-any"/>
-  </xs:annotation>
-  <xs:complexType>
-   <xs:complexContent>
-    <xs:extension base="xs:wildcard">
-     <xs:attributeGroup ref="xs:occurs"/>
-    </xs:extension>
-   </xs:complexContent>
-  </xs:complexType>
- </xs:element>
-
-  <xs:annotation>
-   <xs:documentation>
-   simple type for the value of the 'namespace' attr of
-   'any' and 'anyAttribute'</xs:documentation>
-  </xs:annotation>
-  <xs:annotation>
-   <xs:documentation>
-   Value is
-              ##any      - - any non-conflicting WFXML/attribute at all
-
-              ##other    - - any non-conflicting WFXML/attribute from
-                              namespace other than targetNS
-
-              ##local    - - any unqualified non-conflicting WFXML/attribute 
-
-              one or     - - any non-conflicting WFXML/attribute from
-              more URI        the listed namespaces
-              references
-              (space separated)
-
-    ##targetNamespace or ##local may appear in the above list, to
-        refer to the targetNamespace of the enclosing
-        schema or an absent targetNamespace respectively</xs:documentation>
-  </xs:annotation>
-
- <xs:simpleType name="namespaceList">
-  <xs:annotation>
-   <xs:documentation>
-   A utility type, not for public use</xs:documentation>
-  </xs:annotation>
-  <xs:union>
-   <xs:simpleType>
-    <xs:restriction base="xs:token">
-     <xs:enumeration value="##any"/>
-     <xs:enumeration value="##other"/>
-    </xs:restriction>
-   </xs:simpleType>
-   <xs:simpleType>
-    <xs:list>
-     <xs:simpleType>
-      <xs:union memberTypes="xs:anyURI">
-       <xs:simpleType>
-        <xs:restriction base="xs:token">
-         <xs:enumeration value="##targetNamespace"/>
-         <xs:enumeration value="##local"/>
-        </xs:restriction>
-       </xs:simpleType>
-      </xs:union>
-     </xs:simpleType>
-    </xs:list>
-   </xs:simpleType>
-  </xs:union>
- </xs:simpleType>
-
- <xs:element name="attribute" type="xs:topLevelAttribute" id="attribute">
-  <xs:annotation>
-   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-attribute"/>
-  </xs:annotation>
- </xs:element>
-
- <xs:complexType name="attributeGroup" abstract="true">
-  <xs:complexContent>
-   <xs:extension base="xs:annotated">
-    <xs:group ref="xs:attrDecls"/>
-    <xs:attributeGroup ref="xs:defRef"/>
-   </xs:extension>
-  </xs:complexContent>
- </xs:complexType>
- 
- <xs:complexType name="namedAttributeGroup">
-  <xs:complexContent>
-   <xs:restriction base="xs:attributeGroup">
-    <xs:sequence>
-     <xs:element ref="xs:annotation" minOccurs="0"/>
-     <xs:group ref="xs:attrDecls"/>
-    </xs:sequence>
-    <xs:attribute name="name" use="required" type="xs:NCName"/>
-    <xs:attribute name="ref" use="prohibited"/>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-   </xs:restriction>
-  </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="attributeGroupRef">
-  <xs:complexContent>
-   <xs:restriction base="xs:attributeGroup">
-    <xs:sequence>
-     <xs:element ref="xs:annotation" minOccurs="0"/>
-    </xs:sequence>
-    <xs:attribute name="ref" use="required" type="xs:QName"/>
-    <xs:attribute name="name" use="prohibited"/>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-   </xs:restriction>
-  </xs:complexContent>
- </xs:complexType>
-
- <xs:element name="attributeGroup" type="xs:namedAttributeGroup" id="attributeGroup">
-  <xs:annotation>
-   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-attributeGroup"/>
-  </xs:annotation>
- </xs:element>
-
- <xs:element name="include" id="include">
-  <xs:annotation>
-   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-include"/>
-  </xs:annotation>
-  <xs:complexType>
-   <xs:complexContent>
-    <xs:extension base="xs:annotated">
-     <xs:attribute name="schemaLocation" type="xs:anyURI" use="required"/>
-    </xs:extension>
-   </xs:complexContent>
-  </xs:complexType>
- </xs:element>
-
- <xs:element name="redefine" id="redefine">
-  <xs:annotation>
-   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-redefine"/>
-  </xs:annotation>
-  <xs:complexType>
-   <xs:complexContent>
-    <xs:extension base="xs:openAttrs">
-     <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element ref="xs:annotation"/>
-      <xs:group ref="xs:redefinable"/>
-     </xs:choice>
-     <xs:attribute name="schemaLocation" type="xs:anyURI" use="required"/>
-     <xs:attribute name="id" type="xs:ID"/>
-    </xs:extension>
-   </xs:complexContent>
-  </xs:complexType>
- </xs:element>
-
- <xs:element name="import" id="import">
-  <xs:annotation>
-   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-import"/>
-  </xs:annotation>
-  <xs:complexType>
-   <xs:complexContent>
-    <xs:extension base="xs:annotated">
-     <xs:attribute name="namespace" type="xs:anyURI"/>
-     <xs:attribute name="schemaLocation" type="xs:anyURI"/>
-    </xs:extension>
-   </xs:complexContent>
-  </xs:complexType>
- </xs:element>
-
- <xs:element name="selector" id="selector">
-  <xs:annotation>
-   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-selector"/>
-  </xs:annotation>
-  <xs:complexType>
-  <xs:complexContent>
-   <xs:extension base="xs:annotated">
-     <xs:attribute name="xpath" use="required">
-      <xs:simpleType>
-       <xs:annotation>
-        <xs:documentation>A subset of XPath expressions for use
-in selectors</xs:documentation>
-        <xs:documentation>A utility type, not for public
-use</xs:documentation>
-       </xs:annotation>
-       <xs:restriction base="xs:token">
-        <xs:annotation>
-         <xs:documentation>The following pattern is intended to allow XPath
-                           expressions per the following EBNF:
-          Selector    ::=    Path ( '|' Path )*  
-          Path    ::=    ('.//')? Step ( '/' Step )*  
-          Step    ::=    '.' | NameTest  
-          NameTest    ::=    QName | '*' | NCName ':' '*'  
-                           child:: is also allowed
-         </xs:documentation>
-        </xs:annotation>
-        <xs:pattern value="(\.//)?(((child::)?((\i\c*:)?(\i\c*|\*)))|\.)(/(((child::)?((\i\c*:)?(\i\c*|\*)))|\.))*(\|(\.//)?(((child::)?((\i\c*:)?(\i\c*|\*)))|\.)(/(((child::)?((\i\c*:)?(\i\c*|\*)))|\.))*)*">
-        </xs:pattern>
-       </xs:restriction>
-      </xs:simpleType>
-     </xs:attribute>
-   </xs:extension>
-  </xs:complexContent>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="field" id="field">
-  <xs:annotation>
-   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-field"/>
-  </xs:annotation>
-  <xs:complexType>
-  <xs:complexContent>
-   <xs:extension base="xs:annotated">
-     <xs:attribute name="xpath" use="required">
-      <xs:simpleType>
-       <xs:annotation>
-        <xs:documentation>A subset of XPath expressions for use
-in fields</xs:documentation>
-        <xs:documentation>A utility type, not for public
-use</xs:documentation>
-       </xs:annotation>
-       <xs:restriction base="xs:token">
-        <xs:annotation>
-         <xs:documentation>The following pattern is intended to allow XPath
-                           expressions per the same EBNF as for selector,
-                           with the following change:
-          Path    ::=    ('.//')? ( Step '/' )* ( Step | '@' NameTest ) 
-         </xs:documentation>
-        </xs:annotation>
-        <xs:pattern value="(\.//)?((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)/)*((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)|((attribute::|@)((\i\c*:)?(\i\c*|\*))))(\|(\.//)?((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)/)*((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)|((attribute::|@)((\i\c*:)?(\i\c*|\*)))))*">
-        </xs:pattern>
-       </xs:restriction>
-      </xs:simpleType>
-     </xs:attribute>
-   </xs:extension>
-  </xs:complexContent>
- </xs:complexType>
- </xs:element>
-
- <xs:complexType name="keybase">
-  <xs:complexContent>
-   <xs:extension base="xs:annotated">
-    <xs:sequence>
-     <xs:element ref="xs:selector"/>
-     <xs:element ref="xs:field" minOccurs="1" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attribute name="name" type="xs:NCName" use="required"/>
-   </xs:extension>
-  </xs:complexContent>
- </xs:complexType>
-
- <xs:group name="identityConstraint">
-  <xs:annotation>
-   <xs:documentation>The three kinds of identity constraints, all with
-                     type of or derived from 'keybase'.
-   </xs:documentation>
-  </xs:annotation>
-  <xs:choice>
-   <xs:element ref="xs:unique"/>
-   <xs:element ref="xs:key"/>
-   <xs:element ref="xs:keyref"/>
-  </xs:choice>
- </xs:group>
-
- <xs:element name="unique" type="xs:keybase" id="unique">
-  <xs:annotation>
-   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-unique"/>
-  </xs:annotation>
- </xs:element>
- <xs:element name="key" type="xs:keybase" id="key">
-  <xs:annotation>
-   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-key"/>
-  </xs:annotation>
- </xs:element>
- <xs:element name="keyref" id="keyref">
-  <xs:annotation>
-   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-keyref"/>
-  </xs:annotation>
-  <xs:complexType>
-   <xs:complexContent>
-    <xs:extension base="xs:keybase">
-     <xs:attribute name="refer" type="xs:QName" use="required"/>
-    </xs:extension>
-   </xs:complexContent>
-  </xs:complexType>
- </xs:element>
-
- <xs:element name="notation" id="notation">
-  <xs:annotation>
-   <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-notation"/>
-  </xs:annotation>
-  <xs:complexType>
-   <xs:complexContent>
-    <xs:extension base="xs:annotated">
-     <xs:attribute name="name" type="xs:NCName" use="required"/>
-     <xs:attribute name="public" type="xs:public"/>
-     <xs:attribute name="system" type="xs:anyURI"/>
-    </xs:extension>
-   </xs:complexContent>
-  </xs:complexType>
- </xs:element>
-
- <xs:simpleType name="public">
-  <xs:annotation>
-   <xs:documentation>
-   A utility type, not for public use</xs:documentation>
-   <xs:documentation>
-   A public identifier, per ISO 8879</xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:token"/>
- </xs:simpleType>
-
- <xs:element name="appinfo" id="appinfo">
-   <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-appinfo"/>
-   </xs:annotation>
-   <xs:complexType mixed="true">
-    <xs:sequence minOccurs="0" maxOccurs="unbounded">
-     <xs:any processContents="lax"/>
-    </xs:sequence>
-    <xs:attribute name="source" type="xs:anyURI"/>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-   </xs:complexType>
- </xs:element>
-
- <xs:element name="documentation" id="documentation">
-   <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-documentation"/>
-   </xs:annotation>
-   <xs:complexType mixed="true">
-    <xs:sequence minOccurs="0" maxOccurs="unbounded">
-     <xs:any processContents="lax"/>
-    </xs:sequence>
-    <xs:attribute name="source" type="xs:anyURI"/>
-    <xs:attribute ref="xml:lang"/>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-   </xs:complexType>
- </xs:element>
-
- <xs:element name="annotation" id="annotation">
-   <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xmlschema-1/#element-annotation"/>
-   </xs:annotation>
-   <xs:complexType>
-    <xs:complexContent>
-     <xs:extension base="xs:openAttrs">
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-       <xs:element ref="xs:appinfo"/>
-       <xs:element ref="xs:documentation"/>
-      </xs:choice>
-      <xs:attribute name="id" type="xs:ID"/>
-     </xs:extension>
-    </xs:complexContent>
-   </xs:complexType>
- </xs:element>
-
- <xs:annotation>
-  <xs:documentation>
-   notations for use within XML Schema schemas</xs:documentation>
- </xs:annotation>
-
- <xs:notation name="XMLSchemaStructures" public="structures" system="http://www.w3.org/2000/08/XMLSchema.xsd"/>
- <xs:notation name="XML" public="REC-xml-19980210" system="http://www.w3.org/TR/1998/REC-xml-19980210"/>
-  
- <xs:complexType name="anyType" mixed="true">
-  <xs:annotation>
-   <xs:documentation>
-   Not the real urType, but as close an approximation as we can
-   get in the XML representation</xs:documentation>
-  </xs:annotation>
-  <xs:sequence>
-   <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
-  </xs:sequence>
-  <xs:anyAttribute processContents="lax"/>
- </xs:complexType>
-
-  <xs:annotation>
-    <xs:documentation>
-      First the built-in primitive datatypes.  These definitions are for
-      information only, the real built-in definitions are magic.
-    </xs:documentation>
-
-    <xs:documentation>
-      For each built-in datatype in this schema (both primitive and
-      derived) can be uniquely addressed via a URI constructed
-      as follows:
-        1) the base URI is the URI of the XML Schema namespace
-        2) the fragment identifier is the name of the datatype
-
-      For example, to address the int datatype, the URI is:
-
-        http://www.w3.org/2001/XMLSchema#int
-
-      Additionally, each facet definition element can be uniquely
-      addressed via a URI constructed as follows:
-        1) the base URI is the URI of the XML Schema namespace
-        2) the fragment identifier is the name of the facet
-
-      For example, to address the maxInclusive facet, the URI is:
-
-        http://www.w3.org/2001/XMLSchema#maxInclusive
-
-      Additionally, each facet usage in a built-in datatype definition
-      can be uniquely addressed via a URI constructed as follows:
-        1) the base URI is the URI of the XML Schema namespace
-        2) the fragment identifier is the name of the datatype, followed
-           by a period (".") followed by the name of the facet
-
-      For example, to address the usage of the maxInclusive facet in
-      the definition of int, the URI is:
-
-        http://www.w3.org/2001/XMLSchema#int.maxInclusive
-
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:simpleType name="string" id="string">
-    <xs:annotation>
-      <xs:appinfo>
-        <hfp:hasFacet name="length"/>
-        <hfp:hasFacet name="minLength"/>
-        <hfp:hasFacet name="maxLength"/>
-        <hfp:hasFacet name="pattern"/>
-        <hfp:hasFacet name="enumeration"/>
-        <hfp:hasFacet name="whiteSpace"/>
-        <hfp:hasProperty name="ordered" value="false"/>
-        <hfp:hasProperty name="bounded" value="false"/>
-        <hfp:hasProperty name="cardinality" value="countably infinite"/>
-        <hfp:hasProperty name="numeric" value="false"/>
-      </xs:appinfo>
-      <xs:documentation
-                source="http://www.w3.org/TR/xmlschema-2/#string"/>
-    </xs:annotation>
-    <xs:restriction base="xs:anySimpleType">
-      <xs:whiteSpace value="preserve" id="string.preserve"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="boolean" id="boolean">
-    <xs:annotation>
-      <xs:appinfo>
-        <hfp:hasFacet name="pattern"/>
-        <hfp:hasFacet name="whiteSpace"/>
-        <hfp:hasProperty name="ordered" value="false"/>
-        <hfp:hasProperty name="bounded" value="false"/>
-        <hfp:hasProperty name="cardinality" value="finite"/>
-        <hfp:hasProperty name="numeric" value="false"/>
-      </xs:appinfo>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#boolean"/>
-    </xs:annotation>
-    <xs:restriction base="xs:anySimpleType">
-      <xs:whiteSpace value="collapse" fixed="true"
-        id="boolean.whiteSpace"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="float" id="float">
-    <xs:annotation>
-      <xs:appinfo>
-        <hfp:hasFacet name="pattern"/>
-        <hfp:hasFacet name="enumeration"/>
-        <hfp:hasFacet name="whiteSpace"/>
-        <hfp:hasFacet name="maxInclusive"/>
-        <hfp:hasFacet name="maxExclusive"/>
-        <hfp:hasFacet name="minInclusive"/>
-        <hfp:hasFacet name="minExclusive"/>
-        <hfp:hasProperty name="ordered" value="total"/>
-        <hfp:hasProperty name="bounded" value="true"/>
-        <hfp:hasProperty name="cardinality" value="finite"/>
-        <hfp:hasProperty name="numeric" value="true"/>
-      </xs:appinfo>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#float"/>
-    </xs:annotation>
-    <xs:restriction base="xs:anySimpleType">
-      <xs:whiteSpace value="collapse" fixed="true"
-        id="float.whiteSpace"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="double" id="double">
-    <xs:annotation>
-      <xs:appinfo>
-        <hfp:hasFacet name="pattern"/>
-        <hfp:hasFacet name="enumeration"/>
-        <hfp:hasFacet name="whiteSpace"/>
-        <hfp:hasFacet name="maxInclusive"/>
-        <hfp:hasFacet name="maxExclusive"/>
-        <hfp:hasFacet name="minInclusive"/>
-        <hfp:hasFacet name="minExclusive"/>
-        <hfp:hasProperty name="ordered" value="total"/>
-        <hfp:hasProperty name="bounded" value="true"/>
-        <hfp:hasProperty name="cardinality" value="finite"/>
-        <hfp:hasProperty name="numeric" value="true"/>
-      </xs:appinfo>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#double"/>
-    </xs:annotation>
-    <xs:restriction base="xs:anySimpleType">
-      <xs:whiteSpace value="collapse"  fixed="true"
-        id="double.whiteSpace"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="decimal" id="decimal">
-    <xs:annotation>
-      <xs:appinfo>
-        <hfp:hasFacet name="totalDigits"/>
-        <hfp:hasFacet name="fractionDigits"/>
-        <hfp:hasFacet name="pattern"/>
-        <hfp:hasFacet name="whiteSpace"/>
-        <hfp:hasFacet name="enumeration"/>
-        <hfp:hasFacet name="maxInclusive"/>
-        <hfp:hasFacet name="maxExclusive"/>
-        <hfp:hasFacet name="minInclusive"/>
-        <hfp:hasFacet name="minExclusive"/>
-        <hfp:hasProperty name="ordered" value="total"/>
-        <hfp:hasProperty name="bounded" value="false"/>
-        <hfp:hasProperty name="cardinality"
-                value="countably infinite"/>
-        <hfp:hasProperty name="numeric" value="true"/>
-      </xs:appinfo>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#decimal"/>
-    </xs:annotation>
-    <xs:restriction base="xs:anySimpleType">
-      <xs:whiteSpace value="collapse"  fixed="true"
-        id="decimal.whiteSpace"/>
-    </xs:restriction>
-   </xs:simpleType>
-
-   <xs:simpleType name="duration" id="duration">
-    <xs:annotation>
-      <xs:appinfo>
-        <hfp:hasFacet name="pattern"/>
-        <hfp:hasFacet name="enumeration"/>
-        <hfp:hasFacet name="whiteSpace"/>
-        <hfp:hasFacet name="maxInclusive"/>
-        <hfp:hasFacet name="maxExclusive"/>
-        <hfp:hasFacet name="minInclusive"/>
-        <hfp:hasFacet name="minExclusive"/>
-        <hfp:hasProperty name="ordered" value="partial"/>
-        <hfp:hasProperty name="bounded" value="false"/>
-        <hfp:hasProperty name="cardinality"
-                value="countably infinite"/>
-        <hfp:hasProperty name="numeric" value="false"/>
-      </xs:appinfo>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#duration"/>
-    </xs:annotation>
-    <xs:restriction base="xs:anySimpleType">
-      <xs:whiteSpace value="collapse"  fixed="true"
-        id="duration.whiteSpace"/>
-    </xs:restriction>
-   </xs:simpleType>
-
- <xs:simpleType name="dateTime" id="dateTime">
-    <xs:annotation>
-    <xs:appinfo>
-        <hfp:hasFacet name="pattern"/>
-        <hfp:hasFacet name="enumeration"/>
-        <hfp:hasFacet name="whiteSpace"/>
-        <hfp:hasFacet name="maxInclusive"/>
-        <hfp:hasFacet name="maxExclusive"/>
-        <hfp:hasFacet name="minInclusive"/>
-        <hfp:hasFacet name="minExclusive"/>
-        <hfp:hasProperty name="ordered" value="partial"/>
-        <hfp:hasProperty name="bounded" value="false"/>
-        <hfp:hasProperty name="cardinality"
-                value="countably infinite"/>
-        <hfp:hasProperty name="numeric" value="false"/>
-      </xs:appinfo>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#dateTime"/>
-    </xs:annotation>
-    <xs:restriction base="xs:anySimpleType">
-      <xs:whiteSpace value="collapse"  fixed="true"
-        id="dateTime.whiteSpace"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="time" id="time">
-    <xs:annotation>
-    <xs:appinfo>
-        <hfp:hasFacet name="pattern"/>
-        <hfp:hasFacet name="enumeration"/>
-        <hfp:hasFacet name="whiteSpace"/>
-        <hfp:hasFacet name="maxInclusive"/>
-        <hfp:hasFacet name="maxExclusive"/>
-        <hfp:hasFacet name="minInclusive"/>
-        <hfp:hasFacet name="minExclusive"/>
-        <hfp:hasProperty name="ordered" value="partial"/>
-        <hfp:hasProperty name="bounded" value="false"/>
-        <hfp:hasProperty name="cardinality"
-                value="countably infinite"/>
-        <hfp:hasProperty name="numeric" value="false"/>
-      </xs:appinfo>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#time"/>
-    </xs:annotation>
-    <xs:restriction base="xs:anySimpleType">
-      <xs:whiteSpace value="collapse"  fixed="true"
-        id="time.whiteSpace"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="date" id="date">
-   <xs:annotation>
-    <xs:appinfo>
-        <hfp:hasFacet name="pattern"/>
-        <hfp:hasFacet name="enumeration"/>
-        <hfp:hasFacet name="whiteSpace"/>
-        <hfp:hasFacet name="maxInclusive"/>
-        <hfp:hasFacet name="maxExclusive"/>
-        <hfp:hasFacet name="minInclusive"/>
-        <hfp:hasFacet name="minExclusive"/>
-        <hfp:hasProperty name="ordered" value="partial"/>
-        <hfp:hasProperty name="bounded" value="false"/>
-        <hfp:hasProperty name="cardinality"
-                value="countably infinite"/>
-        <hfp:hasProperty name="numeric" value="false"/>
-      </xs:appinfo>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#date"/>
-    </xs:annotation>
-    <xs:restriction base="xs:anySimpleType">
-      <xs:whiteSpace value="collapse"  fixed="true"
-        id="date.whiteSpace"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="gYearMonth" id="gYearMonth">
-   <xs:annotation>
-    <xs:appinfo>
-        <hfp:hasFacet name="pattern"/>
-        <hfp:hasFacet name="enumeration"/>
-        <hfp:hasFacet name="whiteSpace"/>
-        <hfp:hasFacet name="maxInclusive"/>
-        <hfp:hasFacet name="maxExclusive"/>
-        <hfp:hasFacet name="minInclusive"/>
-        <hfp:hasFacet name="minExclusive"/>
-        <hfp:hasProperty name="ordered" value="partial"/>
-        <hfp:hasProperty name="bounded" value="false"/>
-        <hfp:hasProperty name="cardinality"
-                value="countably infinite"/>
-        <hfp:hasProperty name="numeric" value="false"/>
-      </xs:appinfo>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#gYearMonth"/>
-    </xs:annotation>
-    <xs:restriction base="xs:anySimpleType">
-      <xs:whiteSpace value="collapse"  fixed="true"
-        id="gYearMonth.whiteSpace"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="gYear" id="gYear">
-    <xs:annotation>
-    <xs:appinfo>
-        <hfp:hasFacet name="pattern"/>
-        <hfp:hasFacet name="enumeration"/>
-        <hfp:hasFacet name="whiteSpace"/>
-        <hfp:hasFacet name="maxInclusive"/>
-        <hfp:hasFacet name="maxExclusive"/>
-        <hfp:hasFacet name="minInclusive"/>
-        <hfp:hasFacet name="minExclusive"/>
-        <hfp:hasProperty name="ordered" value="partial"/>
-        <hfp:hasProperty name="bounded" value="false"/>
-        <hfp:hasProperty name="cardinality"
-                value="countably infinite"/>
-        <hfp:hasProperty name="numeric" value="false"/>
-      </xs:appinfo>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#gYear"/>
-    </xs:annotation>
-    <xs:restriction base="xs:anySimpleType">
-      <xs:whiteSpace value="collapse"  fixed="true"
-        id="gYear.whiteSpace"/>
-    </xs:restriction>
-  </xs:simpleType>
-
- <xs:simpleType name="gMonthDay" id="gMonthDay">
-    <xs:annotation>
-      <xs:appinfo>
-        <hfp:hasFacet name="pattern"/>
-        <hfp:hasFacet name="enumeration"/>
-        <hfp:hasFacet name="whiteSpace"/>
-        <hfp:hasFacet name="maxInclusive"/>
-        <hfp:hasFacet name="maxExclusive"/>
-        <hfp:hasFacet name="minInclusive"/>
-        <hfp:hasFacet name="minExclusive"/>
-        <hfp:hasProperty name="ordered" value="partial"/>
-        <hfp:hasProperty name="bounded" value="false"/>
-        <hfp:hasProperty name="cardinality"
-                value="countably infinite"/>
-        <hfp:hasProperty name="numeric" value="false"/>
-      </xs:appinfo>
-       <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#gMonthDay"/>
-    </xs:annotation>
-    <xs:restriction base="xs:anySimpleType">
-         <xs:whiteSpace value="collapse" fixed="true"
-                id="gMonthDay.whiteSpace"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="gDay" id="gDay">
-    <xs:annotation>
-  <xs:appinfo>
-        <hfp:hasFacet name="pattern"/>
-        <hfp:hasFacet name="enumeration"/>
-        <hfp:hasFacet name="whiteSpace"/>
-        <hfp:hasFacet name="maxInclusive"/>
-        <hfp:hasFacet name="maxExclusive"/>
-        <hfp:hasFacet name="minInclusive"/>
-        <hfp:hasFacet name="minExclusive"/>
-        <hfp:hasProperty name="ordered" value="partial"/>
-        <hfp:hasProperty name="bounded" value="false"/>
-        <hfp:hasProperty name="cardinality"
-                value="countably infinite"/>
-        <hfp:hasProperty name="numeric" value="false"/>
-      </xs:appinfo>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#gDay"/>
-    </xs:annotation>
-    <xs:restriction base="xs:anySimpleType">
-         <xs:whiteSpace value="collapse"  fixed="true"
-                id="gDay.whiteSpace"/>
-    </xs:restriction>
-  </xs:simpleType>
-
- <xs:simpleType name="gMonth" id="gMonth">
-    <xs:annotation>
-  <xs:appinfo>
-        <hfp:hasFacet name="pattern"/>
-        <hfp:hasFacet name="enumeration"/>
-        <hfp:hasFacet name="whiteSpace"/>
-        <hfp:hasFacet name="maxInclusive"/>
-        <hfp:hasFacet name="maxExclusive"/>
-        <hfp:hasFacet name="minInclusive"/>
-        <hfp:hasFacet name="minExclusive"/>
-        <hfp:hasProperty name="ordered" value="partial"/>
-        <hfp:hasProperty name="bounded" value="false"/>
-        <hfp:hasProperty name="cardinality"
-                value="countably infinite"/>
-        <hfp:hasProperty name="numeric" value="false"/>
-      </xs:appinfo>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#gMonth"/>
-    </xs:annotation>
-    <xs:restriction base="xs:anySimpleType">
-         <xs:whiteSpace value="collapse"  fixed="true"
-                id="gMonth.whiteSpace"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-   <xs:simpleType name="hexBinary" id="hexBinary">
-    <xs:annotation>
-      <xs:appinfo>
-        <hfp:hasFacet name="length"/>
-        <hfp:hasFacet name="minLength"/>
-        <hfp:hasFacet name="maxLength"/>
-        <hfp:hasFacet name="pattern"/>
-        <hfp:hasFacet name="enumeration"/>
-        <hfp:hasFacet name="whiteSpace"/>
-        <hfp:hasProperty name="ordered" value="false"/>
-        <hfp:hasProperty name="bounded" value="false"/>
-        <hfp:hasProperty name="cardinality"
-                value="countably infinite"/>
-        <hfp:hasProperty name="numeric" value="false"/>
-      </xs:appinfo>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#binary"/>
-    </xs:annotation>
-    <xs:restriction base="xs:anySimpleType">
-      <xs:whiteSpace value="collapse" fixed="true"
-        id="hexBinary.whiteSpace"/>
-    </xs:restriction>
-   </xs:simpleType>
-
- <xs:simpleType name="base64Binary" id="base64Binary">
-    <xs:annotation>
-      <xs:appinfo>
-        <hfp:hasFacet name="length"/>
-        <hfp:hasFacet name="minLength"/>
-        <hfp:hasFacet name="maxLength"/>
-        <hfp:hasFacet name="pattern"/>
-        <hfp:hasFacet name="enumeration"/>
-        <hfp:hasFacet name="whiteSpace"/>
-        <hfp:hasProperty name="ordered" value="false"/>
-        <hfp:hasProperty name="bounded" value="false"/>
-        <hfp:hasProperty name="cardinality"
-                value="countably infinite"/>
-        <hfp:hasProperty name="numeric" value="false"/>
-      </xs:appinfo>
-      <xs:documentation
-                source="http://www.w3.org/TR/xmlschema-2/#base64Binary"/>
-    </xs:annotation>
-    <xs:restriction base="xs:anySimpleType">
-      <xs:whiteSpace value="collapse" fixed="true"
-        id="base64Binary.whiteSpace"/>
-    </xs:restriction>
-   </xs:simpleType>
-
-   <xs:simpleType name="anyURI" id="anyURI">
-    <xs:annotation>
-      <xs:appinfo>
-        <hfp:hasFacet name="length"/>
-        <hfp:hasFacet name="minLength"/>
-        <hfp:hasFacet name="maxLength"/>
-        <hfp:hasFacet name="pattern"/>
-        <hfp:hasFacet name="enumeration"/>
-        <hfp:hasFacet name="whiteSpace"/>
-        <hfp:hasProperty name="ordered" value="false"/>
-        <hfp:hasProperty name="bounded" value="false"/>
-        <hfp:hasProperty name="cardinality"
-                value="countably infinite"/>
-        <hfp:hasProperty name="numeric" value="false"/>
-      </xs:appinfo>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#anyURI"/>
-    </xs:annotation>
-    <xs:restriction base="xs:anySimpleType">
-      <xs:whiteSpace value="collapse"  fixed="true"
-        id="anyURI.whiteSpace"/>
-    </xs:restriction>
-   </xs:simpleType>
-
-  <xs:simpleType name="QName" id="QName">
-    <xs:annotation>
-        <xs:appinfo>
-        <hfp:hasFacet name="length"/>
-        <hfp:hasFacet name="minLength"/>
-        <hfp:hasFacet name="maxLength"/>
-        <hfp:hasFacet name="pattern"/>
-        <hfp:hasFacet name="enumeration"/>
-        <hfp:hasFacet name="whiteSpace"/>
-        <hfp:hasProperty name="ordered" value="false"/>
-        <hfp:hasProperty name="bounded" value="false"/>
-        <hfp:hasProperty name="cardinality"
-                value="countably infinite"/>
-        <hfp:hasProperty name="numeric" value="false"/>
-      </xs:appinfo>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#QName"/>
-    </xs:annotation>
-    <xs:restriction base="xs:anySimpleType">
-      <xs:whiteSpace value="collapse"  fixed="true"
-        id="QName.whiteSpace"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-   <xs:simpleType name="NOTATION" id="NOTATION">
-    <xs:annotation>
-        <xs:appinfo>
-        <hfp:hasFacet name="length"/>
-        <hfp:hasFacet name="minLength"/>
-        <hfp:hasFacet name="maxLength"/>
-        <hfp:hasFacet name="pattern"/>
-        <hfp:hasFacet name="enumeration"/>
-        <hfp:hasFacet name="whiteSpace"/>
-        <hfp:hasProperty name="ordered" value="false"/>
-        <hfp:hasProperty name="bounded" value="false"/>
-        <hfp:hasProperty name="cardinality"
-                value="countably infinite"/>
-        <hfp:hasProperty name="numeric" value="false"/>
-      </xs:appinfo>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#NOTATION"/>
-      <xs:documentation>
-        NOTATION cannot be used directly in a schema; rather a type
-        must be derived from it by specifying at least one enumeration
-        facet whose value is the name of a NOTATION declared in the
-        schema.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:restriction base="xs:anySimpleType">
-      <xs:whiteSpace value="collapse"  fixed="true"
-        id="NOTATION.whiteSpace"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:annotation>
-    <xs:documentation>
-      Now the derived primitive types
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:simpleType name="normalizedString" id="normalizedString">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#normalizedString"/>
-    </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:whiteSpace value="replace"
-        id="normalizedString.whiteSpace"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="token" id="token">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#token"/>
-    </xs:annotation>
-    <xs:restriction base="xs:normalizedString">
-      <xs:whiteSpace value="collapse" id="token.whiteSpace"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="language" id="language">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#language"/>
-    </xs:annotation>
-    <xs:restriction base="xs:token">
-      <xs:pattern
-        value="[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})*"
-                id="language.pattern">
-        <xs:annotation>
-          <xs:documentation
-                source="http://www.ietf.org/rfc/rfc3066.txt">
-            pattern specifies the content of section 2.12 of XML 1.0e2
-            and RFC 3066 (Revised version of RFC 1766).
-          </xs:documentation>
-        </xs:annotation>
-      </xs:pattern>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="IDREFS" id="IDREFS">
-    <xs:annotation>
-      <xs:appinfo>
-        <hfp:hasFacet name="length"/>
-        <hfp:hasFacet name="minLength"/>
-        <hfp:hasFacet name="maxLength"/>
-        <hfp:hasFacet name="enumeration"/>
-        <hfp:hasFacet name="whiteSpace"/>
-        <hfp:hasFacet name="pattern"/>
-        <hfp:hasProperty name="ordered" value="false"/>
-        <hfp:hasProperty name="bounded" value="false"/>
-        <hfp:hasProperty name="cardinality"
-                value="countably infinite"/>
-        <hfp:hasProperty name="numeric" value="false"/>
-      </xs:appinfo>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#IDREFS"/>
-    </xs:annotation>
-    <xs:restriction>
-      <xs:simpleType>
-        <xs:list itemType="xs:IDREF"/>
-      </xs:simpleType>
-        <xs:minLength value="1" id="IDREFS.minLength"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="ENTITIES" id="ENTITIES">
-    <xs:annotation>
-      <xs:appinfo>
-        <hfp:hasFacet name="length"/>
-        <hfp:hasFacet name="minLength"/>
-        <hfp:hasFacet name="maxLength"/>
-        <hfp:hasFacet name="enumeration"/>
-        <hfp:hasFacet name="whiteSpace"/>
-        <hfp:hasFacet name="pattern"/>
-        <hfp:hasProperty name="ordered" value="false"/>
-        <hfp:hasProperty name="bounded" value="false"/>
-        <hfp:hasProperty name="cardinality"
-                value="countably infinite"/>
-        <hfp:hasProperty name="numeric" value="false"/>
-      </xs:appinfo>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#ENTITIES"/>
-    </xs:annotation>
-    <xs:restriction>
-      <xs:simpleType>
-        <xs:list itemType="xs:ENTITY"/>
-      </xs:simpleType>
-        <xs:minLength value="1" id="ENTITIES.minLength"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="NMTOKEN" id="NMTOKEN">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#NMTOKEN"/>
-    </xs:annotation>
-    <xs:restriction base="xs:token">
-      <xs:pattern value="\c+" id="NMTOKEN.pattern">
-        <xs:annotation>
-          <xs:documentation
-                source="http://www.w3.org/TR/REC-xml#NT-Nmtoken">
-            pattern matches production 7 from the XML spec
-          </xs:documentation>
-        </xs:annotation>
-      </xs:pattern>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="NMTOKENS" id="NMTOKENS">
-    <xs:annotation>
-      <xs:appinfo>
-        <hfp:hasFacet name="length"/>
-        <hfp:hasFacet name="minLength"/>
-        <hfp:hasFacet name="maxLength"/>
-        <hfp:hasFacet name="enumeration"/>
-        <hfp:hasFacet name="whiteSpace"/>
-        <hfp:hasFacet name="pattern"/>
-        <hfp:hasProperty name="ordered" value="false"/>
-        <hfp:hasProperty name="bounded" value="false"/>
-        <hfp:hasProperty name="cardinality"
-                value="countably infinite"/>
-        <hfp:hasProperty name="numeric" value="false"/>
-      </xs:appinfo>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#NMTOKENS"/>
-    </xs:annotation>
-    <xs:restriction>
-      <xs:simpleType>
-        <xs:list itemType="xs:NMTOKEN"/>
-      </xs:simpleType>
-        <xs:minLength value="1" id="NMTOKENS.minLength"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="Name" id="Name">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#Name"/>
-    </xs:annotation>
-    <xs:restriction base="xs:token">
-      <xs:pattern value="\i\c*" id="Name.pattern">
-        <xs:annotation>
-          <xs:documentation
-                        source="http://www.w3.org/TR/REC-xml#NT-Name">
-            pattern matches production 5 from the XML spec
-          </xs:documentation>
-        </xs:annotation>
-      </xs:pattern>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="NCName" id="NCName">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#NCName"/>
-    </xs:annotation>
-    <xs:restriction base="xs:Name">
-      <xs:pattern value="[\i-[:]][\c-[:]]*" id="NCName.pattern">
-        <xs:annotation>
-          <xs:documentation
-                source="http://www.w3.org/TR/REC-xml-names/#NT-NCName">
-            pattern matches production 4 from the Namespaces in XML spec
-          </xs:documentation>
-        </xs:annotation>
-      </xs:pattern>
-    </xs:restriction>
-  </xs:simpleType>
-
-   <xs:simpleType name="ID" id="ID">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#ID"/>
-    </xs:annotation>
-    <xs:restriction base="xs:NCName"/>
-   </xs:simpleType>
-
-   <xs:simpleType name="IDREF" id="IDREF">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#IDREF"/>
-    </xs:annotation>
-    <xs:restriction base="xs:NCName"/>
-   </xs:simpleType>
-
-   <xs:simpleType name="ENTITY" id="ENTITY">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#ENTITY"/>
-    </xs:annotation>
-    <xs:restriction base="xs:NCName"/>
-   </xs:simpleType>
-
-  <xs:simpleType name="integer" id="integer">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#integer"/>
-    </xs:annotation>
-    <xs:restriction base="xs:decimal">
-      <xs:fractionDigits value="0" fixed="true" id="integer.fractionDigits"/>
-      <xs:pattern value="[\-+]?[0-9]+"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="nonPositiveInteger" id="nonPositiveInteger">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#nonPositiveInteger"/>
-    </xs:annotation>
-    <xs:restriction base="xs:integer">
-      <xs:maxInclusive value="0" id="nonPositiveInteger.maxInclusive"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="negativeInteger" id="negativeInteger">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#negativeInteger"/>
-    </xs:annotation>
-    <xs:restriction base="xs:nonPositiveInteger">
-      <xs:maxInclusive value="-1" id="negativeInteger.maxInclusive"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="long" id="long">
-    <xs:annotation>
-      <xs:appinfo>
-        <hfp:hasProperty name="bounded" value="true"/>
-        <hfp:hasProperty name="cardinality" value="finite"/>
-      </xs:appinfo>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#long"/>
-    </xs:annotation>
-    <xs:restriction base="xs:integer">
-      <xs:minInclusive value="-9223372036854775808" id="long.minInclusive"/>
-      <xs:maxInclusive value="9223372036854775807" id="long.maxInclusive"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="int" id="int">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#int"/>
-    </xs:annotation>
-    <xs:restriction base="xs:long">
-      <xs:minInclusive value="-2147483648" id="int.minInclusive"/>
-      <xs:maxInclusive value="2147483647" id="int.maxInclusive"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="short" id="short">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#short"/>
-    </xs:annotation>
-    <xs:restriction base="xs:int">
-      <xs:minInclusive value="-32768" id="short.minInclusive"/>
-      <xs:maxInclusive value="32767" id="short.maxInclusive"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="byte" id="byte">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#byte"/>
-    </xs:annotation>
-    <xs:restriction base="xs:short">
-      <xs:minInclusive value="-128" id="byte.minInclusive"/>
-      <xs:maxInclusive value="127" id="byte.maxInclusive"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="nonNegativeInteger" id="nonNegativeInteger">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#nonNegativeInteger"/>
-    </xs:annotation>
-    <xs:restriction base="xs:integer">
-      <xs:minInclusive value="0" id="nonNegativeInteger.minInclusive"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="unsignedLong" id="unsignedLong">
-    <xs:annotation>
-      <xs:appinfo>
-        <hfp:hasProperty name="bounded" value="true"/>
-        <hfp:hasProperty name="cardinality" value="finite"/>
-      </xs:appinfo>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#unsignedLong"/>
-    </xs:annotation>
-    <xs:restriction base="xs:nonNegativeInteger">
-      <xs:maxInclusive value="18446744073709551615"
-        id="unsignedLong.maxInclusive"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="unsignedInt" id="unsignedInt">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#unsignedInt"/>
-    </xs:annotation>
-    <xs:restriction base="xs:unsignedLong">
-      <xs:maxInclusive value="4294967295"
-        id="unsignedInt.maxInclusive"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="unsignedShort" id="unsignedShort">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#unsignedShort"/>
-    </xs:annotation>
-    <xs:restriction base="xs:unsignedInt">
-      <xs:maxInclusive value="65535"
-        id="unsignedShort.maxInclusive"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="unsignedByte" id="unsignedByte">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#unsignedByte"/>
-    </xs:annotation>
-    <xs:restriction base="xs:unsignedShort">
-      <xs:maxInclusive value="255" id="unsignedByte.maxInclusive"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="positiveInteger" id="positiveInteger">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#positiveInteger"/>
-    </xs:annotation>
-    <xs:restriction base="xs:nonNegativeInteger">
-      <xs:minInclusive value="1" id="positiveInteger.minInclusive"/>
-    </xs:restriction>
-  </xs:simpleType>
-
- <xs:simpleType name="derivationControl">
-  <xs:annotation>
-   <xs:documentation>
-   A utility type, not for public use</xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:NMTOKEN">
-   <xs:enumeration value="substitution"/>
-   <xs:enumeration value="extension"/>
-   <xs:enumeration value="restriction"/>
-   <xs:enumeration value="list"/>
-   <xs:enumeration value="union"/>
-  </xs:restriction>
- </xs:simpleType>
-
- <xs:group name="simpleDerivation">
-  <xs:choice>
-    <xs:element ref="xs:restriction"/>
-    <xs:element ref="xs:list"/>
-    <xs:element ref="xs:union"/>
-  </xs:choice>
- </xs:group>
-
- <xs:simpleType name="simpleDerivationSet">
-  <xs:annotation>
-   <xs:documentation>
-   #all or (possibly empty) subset of {restriction, union, list}
-   </xs:documentation>
-   <xs:documentation>
-   A utility type, not for public use</xs:documentation>
-  </xs:annotation>
-  <xs:union>
-   <xs:simpleType>
-    <xs:restriction base="xs:token">
-     <xs:enumeration value="#all"/>
-    </xs:restriction>
-   </xs:simpleType>
-   <xs:simpleType>
-    <xs:list>
-     <xs:simpleType>
-      <xs:restriction base="xs:derivationControl">
-       <xs:enumeration value="list"/>
-       <xs:enumeration value="union"/>
-       <xs:enumeration value="restriction"/>
-      </xs:restriction>
-     </xs:simpleType>
-    </xs:list>
-   </xs:simpleType>
-  </xs:union>
- </xs:simpleType>
-
-  <xs:complexType name="simpleType" abstract="true">
-    <xs:complexContent>
-      <xs:extension base="xs:annotated">
-        <xs:group ref="xs:simpleDerivation"/>
-        <xs:attribute name="final" type="xs:simpleDerivationSet"/>
-        <xs:attribute name="name" type="xs:NCName">
-          <xs:annotation>
-            <xs:documentation>
-              Can be restricted to required or forbidden
-            </xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="topLevelSimpleType">
-    <xs:complexContent>
-      <xs:restriction base="xs:simpleType">
-        <xs:sequence>
-          <xs:element ref="xs:annotation" minOccurs="0"/>
-          <xs:group ref="xs:simpleDerivation"/>
-        </xs:sequence>
-        <xs:attribute name="name" use="required"
-             type="xs:NCName">
-          <xs:annotation>
-            <xs:documentation>
-              Required at the top level
-            </xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-       <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:restriction>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="localSimpleType">
-    <xs:complexContent>
-      <xs:restriction base="xs:simpleType">
-        <xs:sequence>
-          <xs:element ref="xs:annotation" minOccurs="0"/>
-          <xs:group ref="xs:simpleDerivation"/>
-        </xs:sequence>
-        <xs:attribute name="name" use="prohibited">
-          <xs:annotation>
-            <xs:documentation>
-              Forbidden when nested
-            </xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="final" use="prohibited"/>
-       <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:restriction>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:element name="simpleType" type="xs:topLevelSimpleType" id="simpleType">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#element-simpleType"/>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:group name="facets">
-   <xs:annotation>
-    <xs:documentation>
-       We should use a substitution group for facets, but
-       that's ruled out because it would allow users to
-       add their own, which we're not ready for yet.
-    </xs:documentation>
-   </xs:annotation>
-   <xs:choice>
-    <xs:element ref="xs:minExclusive"/>
-    <xs:element ref="xs:minInclusive"/>
-    <xs:element ref="xs:maxExclusive"/>
-    <xs:element ref="xs:maxInclusive"/>
-    <xs:element ref="xs:totalDigits"/>
-    <xs:element ref="xs:fractionDigits"/>
-    <xs:element ref="xs:length"/>
-    <xs:element ref="xs:minLength"/>
-    <xs:element ref="xs:maxLength"/>
-    <xs:element ref="xs:enumeration"/>
-    <xs:element ref="xs:whiteSpace"/>
-    <xs:element ref="xs:pattern"/>
-   </xs:choice>
-  </xs:group>
-
-  <xs:group name="simpleRestrictionModel">
-   <xs:sequence>
-    <xs:element name="simpleType" type="xs:localSimpleType" minOccurs="0"/>
-    <xs:group ref="xs:facets" minOccurs="0" maxOccurs="unbounded"/>
-   </xs:sequence>
-  </xs:group>
-
-  <xs:element name="restriction" id="restriction">
-   <xs:complexType>
-    <xs:annotation>
-      <xs:documentation
-                source="http://www.w3.org/TR/xmlschema-2/#element-restriction">
-          base attribute and simpleType child are mutually
-          exclusive, but one or other is required
-        </xs:documentation>
-      </xs:annotation>
-      <xs:complexContent>
-        <xs:extension base="xs:annotated">
-         <xs:group ref="xs:simpleRestrictionModel"/>
-         <xs:attribute name="base" type="xs:QName" use="optional"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="list" id="list">
-   <xs:complexType>
-    <xs:annotation>
-      <xs:documentation
-                source="http://www.w3.org/TR/xmlschema-2/#element-list">
-          itemType attribute and simpleType child are mutually
-          exclusive, but one or other is required
-        </xs:documentation>
-      </xs:annotation>
-      <xs:complexContent>
-        <xs:extension base="xs:annotated">
-          <xs:sequence>
-            <xs:element name="simpleType" type="xs:localSimpleType"
-                minOccurs="0"/>
-          </xs:sequence>
-          <xs:attribute name="itemType" type="xs:QName" use="optional"/>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="union" id="union">
-   <xs:complexType>
-    <xs:annotation>
-      <xs:documentation
-                source="http://www.w3.org/TR/xmlschema-2/#element-union">
-          memberTypes attribute must be non-empty or there must be
-          at least one simpleType child
-        </xs:documentation>
-      </xs:annotation>
-      <xs:complexContent>
-        <xs:extension base="xs:annotated">
-          <xs:sequence>
-            <xs:element name="simpleType" type="xs:localSimpleType"
-                minOccurs="0" maxOccurs="unbounded"/>
-          </xs:sequence>
-          <xs:attribute name="memberTypes" use="optional">
-            <xs:simpleType>
-              <xs:list itemType="xs:QName"/>
-            </xs:simpleType>
-          </xs:attribute>
-        </xs:extension>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:complexType name="facet">
-    <xs:complexContent>
-      <xs:extension base="xs:annotated">
-        <xs:attribute name="value" use="required"/>
-        <xs:attribute name="fixed" type="xs:boolean" use="optional"
-                      default="false"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
- <xs:complexType name="noFixedFacet">
-  <xs:complexContent>
-   <xs:restriction base="xs:facet">
-    <xs:sequence>
-     <xs:element ref="xs:annotation" minOccurs="0"/>
-    </xs:sequence>
-    <xs:attribute name="fixed" use="prohibited"/>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-   </xs:restriction>
-  </xs:complexContent>
- </xs:complexType>
-
-  <xs:element name="minExclusive" id="minExclusive" type="xs:facet">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#element-minExclusive"/>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="minInclusive" id="minInclusive" type="xs:facet">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#element-minInclusive"/>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="maxExclusive" id="maxExclusive" type="xs:facet">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#element-maxExclusive"/>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="maxInclusive" id="maxInclusive" type="xs:facet">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#element-maxInclusive"/>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:complexType name="numFacet">
-    <xs:complexContent>
-      <xs:restriction base="xs:facet">
-       <xs:sequence>
-         <xs:element ref="xs:annotation" minOccurs="0"/>
-       </xs:sequence>
-       <xs:attribute name="value" type="xs:nonNegativeInteger" use="required"/>
-       <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:restriction>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:element name="totalDigits" id="totalDigits">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#element-totalDigits"/>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:complexContent>
-        <xs:restriction base="xs:numFacet">
-          <xs:sequence>
-            <xs:element ref="xs:annotation" minOccurs="0"/>
-          </xs:sequence>
-          <xs:attribute name="value" type="xs:positiveInteger" use="required"/>
-         <xs:anyAttribute namespace="##other" processContents="lax"/>
-        </xs:restriction>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="fractionDigits" id="fractionDigits" type="xs:numFacet">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#element-fractionDigits"/>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="length" id="length" type="xs:numFacet">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#element-length"/>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="minLength" id="minLength" type="xs:numFacet">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#element-minLength"/>
-    </xs:annotation>
-  </xs:element>
-  <xs:element name="maxLength" id="maxLength" type="xs:numFacet">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#element-maxLength"/>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="enumeration" id="enumeration" type="xs:noFixedFacet">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#element-enumeration"/>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="whiteSpace" id="whiteSpace">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#element-whiteSpace"/>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:complexContent>
-        <xs:restriction base="xs:facet">
-          <xs:sequence>
-            <xs:element ref="xs:annotation" minOccurs="0"/>
-          </xs:sequence>
-          <xs:attribute name="value" use="required">
-            <xs:simpleType>
-              <xs:restriction base="xs:NMTOKEN">
-                <xs:enumeration value="preserve"/>
-                <xs:enumeration value="replace"/>
-                <xs:enumeration value="collapse"/>
-              </xs:restriction>
-            </xs:simpleType>
-          </xs:attribute>
-         <xs:anyAttribute namespace="##other" processContents="lax"/>
-        </xs:restriction>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="pattern" id="pattern">
-    <xs:annotation>
-      <xs:documentation
-        source="http://www.w3.org/TR/xmlschema-2/#element-pattern"/>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:complexContent>
-        <xs:restriction base="xs:noFixedFacet">
-          <xs:sequence>
-            <xs:element ref="xs:annotation" minOccurs="0"/>
-          </xs:sequence>
-          <xs:attribute name="value" type="xs:string" use="required"/>
-         <xs:anyAttribute namespace="##other" processContents="lax"/>
-        </xs:restriction>
-      </xs:complexContent>
-    </xs:complexType>
-  </xs:element>
-
-</xs:schema>
diff --git a/mocca-1.2.11/BKUOnline/src/main/custom-binding/cardchannel-custom.xml b/mocca-1.2.11/BKUOnline/src/main/custom-binding/cardchannel-custom.xml
deleted file mode 100644
index b46aa6a8..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/custom-binding/cardchannel-custom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2008 Federal Chancellery Austria and
-  Graz University of Technology
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!--
-    Binding customization for STAL schema (stal.xsd)
-    Use JAXB version 2.1 which supports "schema component designator" (SCD, http://www.w3.org/TR/xmlschema-ref/)
-    
-    All request/response types are generated to at.gv.egiz.stal
-    and renamed (...Type suffix removed), 
-    except for the base types of the modified implClasses ErrorResponse and SignRequest
-    
-    IMPORTANT: WHEN REGENERATING CLASSES MAKE SURE TO BACKUP MODIFIED IMPLCLASSES (ErrorResponse and SignRequest)
--->
-<bindings xmlns='http://java.sun.com/xml/ns/jaxb' version='2.1'
-          xmlns:xs='http://www.w3.org/2001/XMLSchema'
-          xmlns:xjc='http://java.sun.com/xml/ns/jaxb/xjc'
-          xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
-          schemaLocation='../wsdl/CardChannel.xsd'
-          xsi:schemaLocation='http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd
-                              http://www.w3.org/2001/XMLSchema http://www.w3.org/2001/XMLSchema.xsd'>
-
-    <!-- cannot use scd, CardChannel.xsd has no namespace?! -->
-    <schemaBindings>
-        <package name="at.buergerkarte.namespaces.cardchannel.service"/>
-    </schemaBindings>
-</bindings>
diff --git a/mocca-1.2.11/BKUOnline/src/main/custom-binding/stalservice-custom.xml b/mocca-1.2.11/BKUOnline/src/main/custom-binding/stalservice-custom.xml
deleted file mode 100644
index 7c5f604d..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/custom-binding/stalservice-custom.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2008 Federal Chancellery Austria and
-  Graz University of Technology
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!--
-    Binding customization for STAL service (stal.wsdl)
-    JAX-WS does not yet support "schema component designator"s (SCD, http://www.w3.org/TR/xmlschema-ref/)
--->
-<bindings xmlns="http://java.sun.com/xml/ns/jaxws"
-        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-        xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-        xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-        wsdlLocation="../wsdl/stal-service.wsdl">
-    
-            
-    <!-- default settings 
-    <enableWrapperStyle>true</enableWrapperStyle>
-    <enableAsyncMapping>false</enableAsyncMapping-->
-    <package name="at.gv.egiz.stal.service" />
-
-    <!-- wsdl:portType customization -->
-    <bindings node="wsdl:definitions/wsdl:portType[@name='STALPortType']">
-        <!-- change generated SEI class -->
-        <!--class name="STALServiceI" /-->
-        
-        <!-- override default settings -->
-        <enableWrapperStyle>true</enableWrapperStyle>
-        <enableAsyncMapping>false</enableAsyncMapping>
-    </bindings>
-    
-    <!-- wsdl:portType operation customization -->
-    <bindings node="wsdl:definitions/wsdl:portType[@name='STALPortType']/wsdl:operation[@name='connect']">
-        <!-- rename method name -->
-        <method name="connect">
-            <javadoc>Initial connection, get the first request.</javadoc>
-        </method>
-        
-        <!-- rename method params -->
-        <parameter part="wsdl:definitions/wsdl:message[@name='ConnectRequest']/wsdl:part[@name='part1']" name="sessionId" />
-        
-        <!-- override default settings -->
-        <enableWrapperStyle>true</enableWrapperStyle>
-        <enableAsyncMapping>false</enableAsyncMapping>
-    </bindings>
-    
-    <bindings node="wsdl:definitions/wsdl:portType[@name='STALPortType']/wsdl:operation[@name='nextRequest']">
-        <!-- rename method name -->
-        <method name="getNextRequest">
-            <javadoc>Fetch the next request.</javadoc>
-        </method>
-        
-        <!-- rename method params -->
-        <parameter part="wsdl:definitions/wsdl:message[@name='NextRequestRequest']/wsdl:part[@name='part1']" name="request" />
-        
-        <!-- override default settings -->
-        <enableWrapperStyle>true</enableWrapperStyle>
-        <enableAsyncMapping>false</enableAsyncMapping>
-    </bindings>
-    
-    <bindings node="wsdl:definitions/wsdl:portType[@name='STALPortType']/wsdl:operation[@name='getHashDataInput']">
-        <!-- rename method name -->
-        <method name="getHashDataInput">
-            <javadoc>Fetch the signed references corresponding to the previous SignatureRequest.</javadoc>
-        </method>
-        
-        <!-- rename method params -->
-        <parameter part="wsdl:definitions/wsdl:message[@name='GetHashDataInputRequest']/wsdl:part[@name='part1']" name="request" />
-        
-        <!-- override default settings -->
-        <enableWrapperStyle>true</enableWrapperStyle>
-        <enableAsyncMapping>false</enableAsyncMapping>
-    </bindings>
-    
-    <!-- wsdl:service customization -->
-    <!--bindings node="wsdl:definitions/wsdl:service[@name='STALService']">
-        <class name="STALService"/>
-    </bindings-->
-    
-    <!-- change the port accessor method -->
-    <!-- bindings node="wsdl:definitions/wsdl:service[@name='STALService']/wsdl:port[@name='STALPort']">
-        <method name="getSTALServicePort"/>
-    </bindings -->    
-    
-    <!-- INLINED SCHEMA CUSTOMIZATION 
-    <bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://danu.iaik.tugraz.at/xml']">
-        <jaxb:schemaBindings>
-            <jaxb:package name="iaik.ws.sample.sandbox.generated.service.jaxb" />
-        </jaxb:schemaBindings>
-    </bindings-->
-    
-    <!-- EXTERNAL SCHEMA CUSTOMIZATION in custom-jaxb.xml -->
-    
-    <!--bindings node="wsdl:definitions" xmlns:jws="http://java.sun.com/xml/ns/javaee">
-        <jws:handler-chains>
-            <jws:handler-chain>
-                <jws:handler>
-                    <jws:handler-class>fromwsdlhandler.common.LoggingHandler</jws:handler-class>
-                </jws:handler>
-            </jws:handler-chain>
-        </jws:handler-chains>
-    </bindings-->
-    
-</bindings>
\ No newline at end of file
diff --git a/mocca-1.2.11/BKUOnline/src/main/custom-binding/staltypes-custom.xml b/mocca-1.2.11/BKUOnline/src/main/custom-binding/staltypes-custom.xml
deleted file mode 100644
index 2925fb91..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/custom-binding/staltypes-custom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2008 Federal Chancellery Austria and
-  Graz University of Technology
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!--
-    Binding customization for STAL schema (stal.xsd)
-    Use JAXB version 2.1 which supports "schema component designator" (SCD, http://www.w3.org/TR/xmlschema-ref/)
-    
-    All request/response types are generated to at.gv.egiz.stal
-    and renamed (...Type suffix removed), 
-    except for the base types of the modified implClasses ErrorResponse and SignRequest
-    
-    IMPORTANT: WHEN REGENERATING CLASSES MAKE SURE TO BACKUP MODIFIED IMPLCLASSES (ErrorResponse and SignRequest)
--->
-<bindings xmlns='http://java.sun.com/xml/ns/jaxb' version='2.1'
-          xmlns:xs='http://www.w3.org/2001/XMLSchema'
-          xmlns:stal="http://www.egiz.gv.at/stal"
-          xmlns:xjc='http://java.sun.com/xml/ns/jaxb/xjc'
-          xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
-          xsi:schemaLocation='http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd
-                              http://www.w3.org/2001/XMLSchema http://www.w3.org/2001/XMLSchema.xsd'>
-    <bindings scd="x-schema::stal" xmlns:stal="http://www.egiz.gv.at/stal">
-        <schemaBindings>
-            <!-- generate all classes to at.gv.egiz.stal, then move service-only classes to at.gv.egiz.stal.service -->
-            <package name="at.gv.egiz.stal.service.types"/>
-        </schemaBindings>
-    </bindings>
-    <!--bindings scd="/type::stal:RequestType">
-        <class name="STALRequest"/>
-    </bindings>
-    <bindings scd="/type::stal:ResponseType">
-        <class name="STALResponse"/>
-    </bindings-->
-</bindings>
diff --git a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/bku/online/accesscontroller/SpringSecurityManager.java b/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/bku/online/accesscontroller/SpringSecurityManager.java
deleted file mode 100644
index 5795478b..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/bku/online/accesscontroller/SpringSecurityManager.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*

-* Copyright 2008 Federal Chancellery Austria and

-* Graz University of Technology

-*

-* Licensed under the Apache License, Version 2.0 (the "License");

-* you may not use this file except in compliance with the License.

-* You may obtain a copy of the License at

-*

-*     http://www.apache.org/licenses/LICENSE-2.0

-*

-* Unless required by applicable law or agreed to in writing, software

-* distributed under the License is distributed on an "AS IS" BASIS,

-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-* See the License for the specific language governing permissions and

-* limitations under the License.

-*/

-package at.gv.egiz.bku.online.accesscontroller;

-

-import java.io.IOException;

-

-import org.apache.commons.logging.Log;

-import org.apache.commons.logging.LogFactory;

-import org.springframework.context.ResourceLoaderAware;

-import org.springframework.core.io.Resource;

-import org.springframework.core.io.ResourceLoader;

-

-import at.gv.egiz.bku.accesscontroller.SecurityManagerFacade;

-import at.gv.egiz.bku.conf.Configurator;

-

-public class SpringSecurityManager extends SecurityManagerFacade implements

-		ResourceLoaderAware {

-

-	private ResourceLoader resourceLoader;

-

-	private static Log log = LogFactory.getLog(SpringSecurityManager.class);

-

-	protected Configurator config;

-

-	public void setConfig(Configurator config) {

-		this.config = config;

-	}

-

-	public void init() {

-		String noMatch = config.getProperty("AccessController.acceptNoMatch");

-		if (noMatch != null) {

-			log.debug("Setting allow now match to: " + noMatch);

-			setAllowUnmatched(Boolean.getBoolean(noMatch));

-		}

-		String policy = config.getProperty("AccessController.policyResource");

-		log.info("Loading resource: " + policy);

-		try {

-			Resource res = resourceLoader.getResource(policy);

-			init(res.getInputStream());

-		} catch (IOException e) {

-			log.error(e);

-		}

-	}

-

-	@Override

-	public void setResourceLoader(ResourceLoader loader) {

-		this.resourceLoader = loader;

-	}

-}

diff --git a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/bku/online/conf/SpringConfigurator.java b/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/bku/online/conf/SpringConfigurator.java
deleted file mode 100644
index 6030c1c0..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/bku/online/conf/SpringConfigurator.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*

- * Copyright 2008 Federal Chancellery Austria and

- * Graz University of Technology

- *

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- *

- *     http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- */

-package at.gv.egiz.bku.online.conf;

-

-import java.io.File;

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.Properties;

-

-import org.apache.commons.logging.Log;

-import org.apache.commons.logging.LogFactory;

-import org.springframework.context.ResourceLoaderAware;

-import org.springframework.core.io.Resource;

-import org.springframework.core.io.ResourceLoader;

-

-import at.gv.egiz.bku.conf.Configurator;

-import at.gv.egiz.bku.online.webapp.SpringBKUServlet;

-import at.gv.egiz.bku.slexceptions.SLRuntimeException;

-import at.gv.egiz.stal.service.impl.RequestBrokerSTALFactory;

-

-public class SpringConfigurator extends Configurator implements

-    ResourceLoaderAware {

-

-  private final static Log log = LogFactory.getLog(SpringConfigurator.class);

-

-  private ResourceLoader resourceLoader;

-

-  public void setResource(Resource resource) {

-    log.debug("Loading config from: " + resource);

-    if (resource != null) {

-      Properties props = new Properties();

-      try {

-        props.load(resource.getInputStream());

-        super.setConfiguration(props);

-      } catch (IOException e) {

-        log.error("Cannot load config", e);

-      }

-    } else {

-      log.warn("Cannot load properties, resource: " + resource);

-    }

-  }

-

-  public void configureNetwork() {

-    super.configureNetwork();

-    String appletTimeout = getProperty("AppletTimeout");

-    if ((appletTimeout != null)) {

-      try {

-        long ato = Long.parseLong(appletTimeout);

-        log.debug("Setting applet timeout to:"+ato);

-        RequestBrokerSTALFactory.setTimeout(ato);

-      } catch (NumberFormatException nfe) {

-        log.error("Cannot set Applettimeout", nfe);

-      }

-

-    }

-  }

-  

-  public void configure() {

-    super.configure();

-    SpringBKUServlet.setConfigurator(this);

-  }

-

-  @Override

-  public void setResourceLoader(ResourceLoader loader) {

-    this.resourceLoader = loader;

-  }

-

-  private File getDirectory(String property) {

-    if (property != null) {

-      Resource certDirRes = resourceLoader.getResource(property);

-      File certDir;

-      try {

-        certDir = certDirRes.getFile();

-      } catch (IOException e) {

-        log.error("Cannot get cert directory", e);

-        throw new SLRuntimeException(e);

-      }

-      if (!certDir.isDirectory()) {

-        log.error("Expecting directory as SSL.certDirectory parameter");

-        throw new SLRuntimeException(

-            "Expecting directory as SSL.certDirectory parameter");

-      }

-      return certDir;

-    }

-    return null;

-

-  }

-

-  @Override

-  protected File getCADir() {

-    String caDirectory = getProperty("SSL.caDirectory");

-    return getDirectory(caDirectory);

-  }

-

-  @Override

-  protected File getCertDir() {

-    String certDirectory = getProperty("SSL.certDirectory");

-    return getDirectory(certDirectory);

-  }

-

-  @Override

-  protected InputStream getManifest() {

-    Resource r = resourceLoader.getResource("META-INF/MANIFEST.MF");

-    if (r != null) {

-      try {

-        return r.getInputStream();

-      } catch (IOException e) {

-        log.error("Cannot read manifest data:", e);

-      }

-    }

-    return null;

-  }

-}
\ No newline at end of file
diff --git a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/AppletDispatcher.java b/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/AppletDispatcher.java
deleted file mode 100644
index 24938cd5..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/AppletDispatcher.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2008 Federal Chancellery Austria and
- * Graz University of Technology
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package at.gv.egiz.bku.online.webapp;
-
-import java.io.IOException;
-import java.util.regex.Pattern;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * prevent applet caching, 
- * could be removed once applet is loaded via jnlp
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class AppletDispatcher extends HttpServlet {
-
-  protected final static Log log = LogFactory.getLog(AppletDispatcher.class);
-
-  public static final String DISPATCH_CTX = "dispatch/";
-  public static final String RAND_PREFIX = "__";
-  public static final String RAND_ATTRIBUTE = "rand";
-  public static final Pattern ctxPattern = Pattern.compile(DISPATCH_CTX);
-  public static final Pattern archivePattern = Pattern.compile(RAND_PREFIX + "[a-zA-Z0-9]*\\.jar$");
-
-    /** 
-     * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
-     * @param request servlet request
-     * @param response servlet response
-     * @throws ServletException if a servlet-specific error occurs
-     * @throws IOException if an I/O error occurs
-     */
-    protected void processRequest(HttpServletRequest request, HttpServletResponse response)
-    throws ServletException, IOException {
-
-      String uri = request.getRequestURI();
-//      log.trace("request URI " + uri);
-
-      uri = uri.substring(request.getContextPath().length());
-//      log.trace("removing contextPath " + uri);
-
-      uri = ctxPattern.matcher(uri).replaceAll("");
-//      log.trace("removing dispatch context " + uri);
-
-      uri = archivePattern.matcher(uri).replaceAll(".jar");
-//      log.trace("removing random suffix " + uri);
-      
-      if (log.isTraceEnabled()) {
-        log.trace("dispatching request URI " + request.getRequestURI() +
-                " to " + uri);
-      }
-      
-      RequestDispatcher dispatcher = getServletContext().getRequestDispatcher(uri);
-      dispatcher.forward(request, response);
-    } 
-
-    // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
-    /** 
-     * Handles the HTTP <code>GET</code> method.
-     * @param request servlet request
-     * @param response servlet response
-     * @throws ServletException if a servlet-specific error occurs
-     * @throws IOException if an I/O error occurs
-     */
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response)
-    throws ServletException, IOException {
-        processRequest(request, response);
-    } 
-
-    /** 
-     * Handles the HTTP <code>POST</code> method.
-     * @param request servlet request
-     * @param response servlet response
-     * @throws ServletException if a servlet-specific error occurs
-     * @throws IOException if an I/O error occurs
-     */
-    @Override
-    protected void doPost(HttpServletRequest request, HttpServletResponse response)
-    throws ServletException, IOException {
-        processRequest(request, response);
-    }
-
-    /** 
-     * Returns a short description of the servlet.
-     * @return a String containing servlet description
-     */
-    @Override
-    public String getServletInfo() {
-        return "Short description";
-    }// </editor-fold>
-
-}
diff --git a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java b/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java
deleted file mode 100644
index 7dfec211..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * Copyright 2008 Federal Chancellery Austria and
- * Graz University of Technology
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package at.gv.egiz.bku.online.webapp;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import at.gv.egiz.bku.binding.BindingProcessor;
-import at.gv.egiz.bku.binding.HTTPBindingProcessor;
-import at.gv.egiz.bku.binding.HttpUtil;
-import at.gv.egiz.bku.binding.IdFactory;
-import at.gv.egiz.bku.utils.StreamUtil;
-import at.gv.egiz.org.apache.tomcat.util.http.AcceptLanguage;
-
-/**
- * Handles SL requests and instantiates BindingProcessors
- * 
- */
-public class BKURequestHandler extends SpringBKUServlet {
-
-  private static final long serialVersionUID = 1L;
-
-  public static final String APPLET_PAGE_P = "appletPage";
-  public static final String APPLET_PAGE_DEFAULT = "BKUApplet";
-  
-  public static final String PARAM_APPLET_WIDTH = "appletWidth";
-  public static final String ATTR_APPLET_WIDTH = "appletWidth";
-  
-  public static final String PARAM_APPLET_HEIGHT = "appletHeight";
-  public static final String ATTR_APPLET_HEIGHT = "appletHeight";
-  
-  public static final String PARAM_APPLET_BACKGROUND = "appletBackground";
-  public static final String ATTR_APPLET_BACKGROUND = "appletBackground";
-  
-  public static final String PARAM_APPLET_BACKGROUND_COLOR = "appletBackgroundColor";
-  public static final String ATTR_APPLET_BACKGROUND_COLOR = "appletBackgroundColor";
-  public static final Pattern PATTERM_APPLET_BACKGROUND_COLOR = Pattern.compile("\\#[0-9a-fA-F]{6}");
-  
-  public static final String PARAM_APPLET_GUI_STYLE = "appletGuiStyle";
-  public static final String ATTR_APPLET_GUI_STYLE = "appletGuiStyle";
-  public static final String[] VALUES_APPLET_GUI_STYLE = new String[] {"tiny", "simple", "advanced"};
-  
-  public static final String PARAM_APPLET_EXTENSION = "appletExtension";
-  public static final String ATTR_APPLET_EXTENSION = "appletExtension";
-  public static final String[] VALUES_APPLET_EXTENSION = new String[] {"pin", "activation"};
-  
-  public static final String PARAM_LOCALE = "locale";
-  public static final String ATTR_LOCALE = "locale";
-  public static final Pattern PATTERN_LOCALE = Pattern.compile("[a-zA-Z][a-zA-Z](_[a-zA-Z][a-zA-Z]){0,2}");
-
-  public final static String REDIRECT_URL_SESSION_ATTRIBUTE = "redirectUrl";
-
-  protected Log log = LogFactory.getLog(BKURequestHandler.class);
-
-  private static String getStringFromStream(InputStream is, String encoding)
-      throws IOException {
-    if (is == null) {
-      return null;
-    }
-    if (encoding == null) {
-      encoding = HttpUtil.DEFAULT_CHARSET;
-    }
-    ByteArrayOutputStream os = new ByteArrayOutputStream();
-    StreamUtil.copyStream(is, os);
-    return new String(os.toByteArray(), encoding);
-  }
-
-  @Override
-  protected void doPost(HttpServletRequest req, HttpServletResponse resp)
-      throws ServletException, java.io.IOException {
-    log.debug("Received SecurityLayer request");
-    
-    HttpSession session = req.getSession(false);
-    if (session != null) {
-      log.warn("Already a session with id: " + session.getId()
-          + " active, trying to get Bindingprocessor");
-      BindingProcessor bp = getBindingProcessorManager().getBindingProcessor(
-          IdFactory.getInstance().createId(session.getId()));
-      if (bp != null) {
-        log.debug("Found binding processor, using this one");
-        String appletPage = getStringFromStream(
-                ((HTTPBindingProcessor) bp).getFormData(APPLET_PAGE_P),
-                req.getCharacterEncoding());
-        getDispatcher(appletPage).forward(req, resp);
-        return;
-      }
-      log.debug("Did not find a binding processor, creating new ...");
-    }
-    session = req.getSession(true);
-    if (log.isDebugEnabled()) {
-      log.debug("Using session id: " + session.getId());
-    }
-
-    String acceptLanguage = req.getHeader("Accept-Language");
-    Locale locale = AcceptLanguage.getLocale(acceptLanguage);
-    log.debug("Accept-Language locale: " + locale);
-
-    HTTPBindingProcessor bindingProcessor;
-    bindingProcessor = (HTTPBindingProcessor) getBindingProcessorManager()
-        .createBindingProcessor(req.getRequestURL().toString(),
-            session.getId(), locale);
-
-    Map<String, String> headerMap = new HashMap<String, String>();
-    for (Enumeration<String> headerName = req.getHeaderNames(); headerName
-        .hasMoreElements();) {
-      String header = headerName.nextElement();
-      if (header != null) {
-        headerMap.put(header, req.getHeader(header));
-      }
-    }
-    String charset = req.getCharacterEncoding();
-    String contentType = req.getContentType();
-    if (charset != null) {
-      contentType += ";" + charset;
-    }
-    headerMap.put(HttpUtil.HTTP_HEADER_CONTENT_TYPE, contentType);
-    bindingProcessor.setHTTPHeaders(headerMap);
-    bindingProcessor.consumeRequestStream(req.getInputStream());
-    req.getInputStream().close();
-    getBindingProcessorManager().process(bindingProcessor);
-
-    log.trace("Trying to find applet parameters in request");
-
-    // appletWidth
-    String width = getStringFromStream(bindingProcessor
-        .getFormData(PARAM_APPLET_WIDTH), charset);
-    if (width != null) {
-      try {
-        // must be a valid integer
-        session.setAttribute(ATTR_APPLET_WIDTH, Integer.parseInt(width));
-        log.trace("Found parameter " + PARAM_APPLET_WIDTH + "='" + width +"'.");
-      } catch (NumberFormatException nfe) {
-        log.warn("Applet parameter " + PARAM_APPLET_WIDTH + 
-            " does not contain a valid value.", nfe);
-      }
-    }
-    
-    // appletHeight
-    String height = getStringFromStream(bindingProcessor
-        .getFormData(PARAM_APPLET_HEIGHT), charset);
-    if (height != null) {
-      try {
-        // must be a valid integer
-        session.setAttribute(ATTR_APPLET_HEIGHT, Integer.parseInt(height));
-        log.trace("Found parameter " + PARAM_APPLET_HEIGHT + "='" + height + "'.");
-      } catch (NumberFormatException nfe) {
-        log.warn("Applet parameter " + PARAM_APPLET_HEIGHT + 
-            " does not contain a valid value.", nfe);
-      }
-    }
-    
-    // appletBackground
-    String background = getStringFromStream(bindingProcessor
-        .getFormData(PARAM_APPLET_BACKGROUND), charset);
-    if (background != null) {
-      session.setAttribute(ATTR_APPLET_BACKGROUND, background);
-      try {
-        // must be a valid http or https URL
-        URI backgroundURL = new URI(background);
-        if ("http".equals(backgroundURL.getScheme()) 
-            || "https".equals(backgroundURL.getScheme())) {
-          session.setAttribute(ATTR_APPLET_BACKGROUND, backgroundURL.toASCIIString());
-          log.trace("Found parameter " + PARAM_APPLET_BACKGROUND + "='" 
-              + backgroundURL.toASCIIString() + "'.");
-        } else {
-          log.warn("Applet parameter " + PARAM_APPLET_BACKGROUND + "='" 
-              + background + "' is not a valid http/https URL.");
-        }
-      } catch (URISyntaxException e) {
-        log.warn("Applet parameter " + PARAM_APPLET_BACKGROUND + "='" 
-            + background + "' is not a valid http/https URL.", e);
-      }
-    }
-    
-    // appletBackgroundColor
-    String backgroundColor = getStringFromStream(bindingProcessor
-        .getFormData(PARAM_APPLET_BACKGROUND_COLOR), charset);
-    if (backgroundColor != null) {
-      // must be a valid color definition
-      if (PATTERM_APPLET_BACKGROUND_COLOR.matcher(backgroundColor).matches()) {
-        session.setAttribute(ATTR_APPLET_BACKGROUND_COLOR, backgroundColor);
-        log.trace("Faund parameter " + PARAM_APPLET_BACKGROUND_COLOR + "='" 
-            + backgroundColor + "'.");
-      } else {
-        log.warn("Applet parameter " + PARAM_APPLET_BACKGROUND_COLOR + "='" 
-            + backgroundColor + "' is not a valid color definition (must be of form '#hhhhhh').");
-      }
-    }
-    
-    // appletGuiStyle
-    String guiStyle = getStringFromStream(bindingProcessor
-        .getFormData(PARAM_APPLET_GUI_STYLE), charset);
-    if (guiStyle != null) {
-      // must be one of VALUES_APPLET_GUI_STYLE
-      String style = guiStyle.toLowerCase();
-      if (Arrays.asList(VALUES_APPLET_GUI_STYLE).contains(style)) {
-        session.setAttribute(ATTR_APPLET_GUI_STYLE, style);
-        log.trace("Found parameter " + PARAM_APPLET_GUI_STYLE + "='" 
-            + style + "'.");
-      } else {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Applet parameter ").append(PARAM_APPLET_GUI_STYLE).append(
-            "='").append(guiStyle).append("' is not valid (must be one of ")
-            .append(Arrays.toString(VALUES_APPLET_GUI_STYLE)).append(").");
-        log.warn(sb);
-      }
-    }
-
-    // appletExtension
-    String extension = getStringFromStream(bindingProcessor
-        .getFormData(PARAM_APPLET_EXTENSION), charset);
-    if (extension != null) {
-      // must be one of VALUES_APPLET_EXTENSION
-      String ext = extension.toLowerCase();
-      if (Arrays.asList(VALUES_APPLET_EXTENSION).contains(ext)) {
-        session.setAttribute(ATTR_APPLET_EXTENSION, ext);
-        log.trace("Found parameter " + PARAM_APPLET_EXTENSION + "='" 
-            + ext + "'.");
-      } else {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Applet parameter ").append(PARAM_APPLET_EXTENSION).append(
-            "='").append(extension).append("' is not valid (must be one of ")
-            .append(Arrays.toString(VALUES_APPLET_EXTENSION)).append(").");
-        log.warn(sb);
-      }
-    }
-
-    // locale
-    String localeFormParam = getStringFromStream(bindingProcessor
-        .getFormData(PARAM_LOCALE), charset);
-    if (localeFormParam != null) {
-      // must be a valid locale
-      if (PATTERN_LOCALE.matcher(localeFormParam).matches()) {
-        locale = new Locale(localeFormParam);
-        log.debug("Overrule accept-language header locale " + locale
-            + " with form param " + localeFormParam + ".");
-      } else {
-        log.warn("Parameter " + PARAM_LOCALE + "='" + localeFormParam
-            + "' is not a valid locale definition.");
-      }
-    }
-    if (locale != null) {
-      log.debug("Using locale " + locale);
-      session.setAttribute(ATTR_LOCALE, locale.toString());
-    }
-    
-    // handle server side redirect url after processing
-    String redirectUrl = bindingProcessor.getRedirectURL(); 
-    if ( redirectUrl != null) {
-      log.info("Got redirect URL "+redirectUrl+". Deferring browser redirect.");
-      session.setAttribute(REDIRECT_URL_SESSION_ATTRIBUTE, redirectUrl);
-    }
-
-    String appletPage = getStringFromStream(bindingProcessor
-        .getFormData(APPLET_PAGE_P), charset);
-    getDispatcher(appletPage).forward(req, resp);
-  }
-
-  @Override
-  protected void doGet(HttpServletRequest req, HttpServletResponse resp)
-      throws ServletException, java.io.IOException {
-    doPost(req, resp);
-  }
-
-  private RequestDispatcher getDispatcher(String appletPage) {
-    RequestDispatcher dispatcher = null;
-    if (appletPage != null) {
-      log.trace("requested appletPage " + appletPage);
-      dispatcher = getServletContext().getNamedDispatcher(appletPage);
-    }
-    if (dispatcher == null) {
-      log.debug("no appletPage requested or appletPage not configured, using default");
-      appletPage = APPLET_PAGE_DEFAULT;
-      dispatcher = getServletContext().getNamedDispatcher(appletPage);
-    }
-//    session.setAttribute(APPLET_PAGE_P, appletPage);
-    log.debug("forward to applet " + appletPage);
-
-    return dispatcher;
-  }
-
-}
diff --git a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ResultServlet.java b/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ResultServlet.java
deleted file mode 100644
index 5ffe2399..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ResultServlet.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright 2008 Federal Chancellery Austria and
- * Graz University of Technology
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package at.gv.egiz.bku.online.webapp;
-
-import java.io.IOException;
-import java.util.Iterator;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import at.gv.egiz.bku.binding.HTTPBindingProcessor;
-import at.gv.egiz.bku.binding.HttpUtil;
-import at.gv.egiz.bku.binding.IdFactory;
-import at.gv.egiz.bku.conf.Configurator;
-import at.gv.egiz.bku.utils.NullOutputStream;
-
-/**
- * Delivers the result to the browser
- * 
- */
-public class ResultServlet extends SpringBKUServlet {
-
-  private final static Log log = LogFactory.getLog(ResultServlet.class);
-
-  private String encoding = "UTF-8";
-  private String expiredPage = "./expiredError.jsp";
-
-  public ResultServlet() {
-  }
-
-  private void myInit() {
-    String enc = getServletContext().getInitParameter("responseEncoding");
-    if (enc != null) {
-      log.debug("Init default encoding to: " + enc);
-      encoding = enc;
-    }
-    String expP = getServletConfig().getInitParameter("expiredPage");
-    if (expP != null) {
-      log.debug("Init expired page to: " + expP);
-      expiredPage = expP;
-    }
-  }
-
-  @Override
-  public void init() throws ServletException {
-    super.init();
-    myInit();
-  }
-
-  @Override
-  public void init(ServletConfig config) throws ServletException {
-    super.init(config);
-    myInit();
-  }
-
-  protected void doPost(HttpServletRequest req, HttpServletResponse resp)
-      throws ServletException, IOException {
-    doGet(req, resp);
-  }
-
-  protected void doGet(HttpServletRequest req, HttpServletResponse resp)
-      throws ServletException, java.io.IOException { 
-    String version = configurator.getProperty(Configurator.SIGNATURE_LAYOUT);
-    if ((version != null) && (!"".equals(version.trim()))) {
-      log.debug("setting SignatureLayout header to " + version);
-      resp.setHeader(Configurator.SIGNATURE_LAYOUT, version);
-    } else {
-      log.debug("do not set SignatureLayout header");
-    }
-      
-    if (configurator.getProperty(Configurator.USERAGENT_CONFIG_P) != null) {
-      resp.setHeader(HttpUtil.HTTP_HEADER_SERVER, configurator
-          .getProperty(Configurator.USERAGENT_CONFIG_P));
-    } else {
-      resp.setHeader(HttpUtil.HTTP_HEADER_SERVER,
-              Configurator.USERAGENT_DEFAULT);
-    }
-
-    HttpSession session = req.getSession(false);
-    if (session == null) {
-      resp.sendRedirect(expiredPage);
-      return;
-    }
-    String sessionId = session.getId();
-    if (sessionId == null) {
-      resp.sendRedirect(expiredPage);
-      return;
-    }
-    log.debug("Got a result request for session: " + sessionId);
-    HTTPBindingProcessor bp = (HTTPBindingProcessor) getBindingProcessorManager()
-        .getBindingProcessor(IdFactory.getInstance().createId(sessionId));
-    if (bp == null) {
-      session.invalidate();
-      resp.sendRedirect(expiredPage);
-      return;
-    }
-    String redirectUrl = (String) session
-        .getAttribute(BKURequestHandler.REDIRECT_URL_SESSION_ATTRIBUTE);
-    if (redirectUrl == null) {
-      redirectUrl = bp.getRedirectURL();
-    }
-    if (redirectUrl != null) {
-      try {
-        bp.writeResultTo(new NullOutputStream(), encoding);
-        getBindingProcessorManager().removeBindingProcessor(bp.getId());
-      } finally {
-          log.info("Executing deferred browser redirect to: " + redirectUrl);
-        resp.sendRedirect(redirectUrl);
-        session.invalidate();
-      }
-      return;
-    }
-
-    log.trace("setting response code: " + bp.getResponseCode());
-    resp.setStatus(bp.getResponseCode());
-    resp.setHeader("Cache-Control", "no-store"); // HTTP 1.1
-    resp.setHeader("Pragma", "no-cache"); // HTTP 1.0
-    resp.setDateHeader("Expires", 0);
-    for (Iterator<String> it = bp.getResponseHeaders().keySet().iterator(); it
-        .hasNext();) {
-      String header = it.next();
-      if (log.isTraceEnabled()) {
-        log.trace("setting response header " + header + ": " + bp.getResponseHeaders().get(header));
-      }
-      resp.setHeader(header, bp.getResponseHeaders().get(header));
-    }
-    resp.setContentType(bp.getResultContentType());
-    resp.setCharacterEncoding(encoding);
-    bp.writeResultTo(resp.getOutputStream(), encoding);
-    resp.getOutputStream().flush();
-    session.invalidate();
-    getBindingProcessorManager().removeBindingProcessor(bp.getId());
-  }
-}
diff --git a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/SessionTimeout.java b/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/SessionTimeout.java
deleted file mode 100644
index 2b56166c..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/SessionTimeout.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-* Copyright 2008 Federal Chancellery Austria and
-* Graz University of Technology
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-package at.gv.egiz.bku.online.webapp;

-

-import javax.servlet.http.HttpSessionEvent;

-import javax.servlet.http.HttpSessionListener;

-

-import org.apache.commons.logging.Log;

-import org.apache.commons.logging.LogFactory;

-

-import at.gv.egiz.bku.binding.BindingProcessorManager;

-import at.gv.egiz.bku.binding.IdFactory;

-

-/**

- * Session listener to trigger the removal of the BindingProcessor

- *

- */

-public class SessionTimeout implements HttpSessionListener {

-  

-  private static Log log = LogFactory.getLog(SessionTimeout.class);

-

-  @Override

-  public void sessionCreated(HttpSessionEvent arg0) {

-    // TODO Auto-generated method stub

-

-  }

-

-  @Override

-  public void sessionDestroyed(HttpSessionEvent event) {

-    BindingProcessorManager manager = (BindingProcessorManager) event.getSession().getServletContext().getAttribute(SpringBKUServlet.BEAN_NAME);

-    log.info("Removing session: "+event.getSession().getId());

-    manager.removeBindingProcessor(IdFactory.getInstance().createId(event.getSession().getId()));

-  }

-

-}

diff --git a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ShutdownHandler.java b/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ShutdownHandler.java
deleted file mode 100644
index 741b5e32..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/ShutdownHandler.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*

- * Copyright 2008 Federal Chancellery Austria and

- * Graz University of Technology

- * 

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *     http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- */

-

-package at.gv.egiz.bku.online.webapp;

-

-import org.apache.commons.logging.Log;

-import org.apache.commons.logging.LogFactory;

-import org.springframework.context.ApplicationEvent;

-import org.springframework.context.ApplicationListener;

-import org.springframework.context.event.ContextClosedEvent;

-

-import at.gv.egiz.bku.binding.BindingProcessorManager;

-

-public class ShutdownHandler implements ApplicationListener {

-

-	private static Log log = LogFactory.getLog(ShutdownHandler.class);

-

-	private BindingProcessorManager bindingProcessorManager;

-

-	public void setBindingProcessorManager(

-			BindingProcessorManager bindingProcessorManager) {

-		this.bindingProcessorManager = bindingProcessorManager;

-	}

-

-	@Override

-	public void onApplicationEvent(ApplicationEvent event) {

-		if (event instanceof ContextClosedEvent) {

-			log.info("Shutting down BKU");

-			bindingProcessorManager.shutdownNow();

-		}

-

-	}

-

-}

diff --git a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/SpringBKUServlet.java b/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/SpringBKUServlet.java
deleted file mode 100644
index 2c6f522e..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/SpringBKUServlet.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-* Copyright 2008 Federal Chancellery Austria and
-* Graz University of Technology
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-package at.gv.egiz.bku.online.webapp;

-

-import javax.servlet.http.HttpServlet;
-
-import at.gv.egiz.bku.binding.BindingProcessorManager;
-import at.gv.egiz.bku.conf.Configurator;
-

-public abstract class SpringBKUServlet extends HttpServlet {

-

-  public final static String BEAN_NAME="bindingProcessorManager";
-  
-  protected static Configurator configurator; 
-  
-  protected BindingProcessorManager getBindingProcessorManager() {

-    return (BindingProcessorManager) getServletContext().getAttribute(BEAN_NAME);

-  }
-  
-  public static void setConfigurator(Configurator conf) {
-    configurator = conf;
-  }

-}

diff --git a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/RequestBrokerSTALFactory.java b/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/RequestBrokerSTALFactory.java
deleted file mode 100644
index 305d8c1c..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/RequestBrokerSTALFactory.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-* Copyright 2008 Federal Chancellery Austria and
-* Graz University of Technology
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package at.gv.egiz.stal.service.impl;
-
-import java.util.Locale;
-
-import at.gv.egiz.stal.STAL;
-import at.gv.egiz.stal.STALFactory;
-
-/**
- *
- * @author clemens
- */
-public class RequestBrokerSTALFactory implements STALFactory {
-
-  private static long timeout = -1;
-  
-    @Override
-    public STAL createSTAL() {
-      return new STALRequestBrokerImpl(timeout);
-    }
-
-    @Override
-    public void setLocale(Locale locale) {
-    }
-    
-    public static void setTimeout(long millisec) {
-      timeout = millisec;
-    }
-}
diff --git a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBroker.java b/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBroker.java
deleted file mode 100644
index b77f7660..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBroker.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-* Copyright 2008 Federal Chancellery Austria and
-* Graz University of Technology
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package at.gv.egiz.stal.service.impl;
-
-import at.gv.egiz.stal.HashDataInput;
-import at.gv.egiz.stal.STAL;
-import at.gv.egiz.stal.service.types.RequestType;
-import at.gv.egiz.stal.service.types.ResponseType;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-
-/**
- *
- * @author clemens
- */
-public interface STALRequestBroker extends STAL {
-
-    public static final int ERR_4500 = 4500;
-    public static final long DEFAULT_TIMEOUT_MS = 1000*60*5; //5mn
-
-    public List<JAXBElement<? extends RequestType>> connect();
-    
-    public List<JAXBElement<? extends RequestType>> nextRequest(List<JAXBElement<? extends ResponseType>> responses);
-
-    public List<HashDataInput> getHashDataInput();
-}
diff --git a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java b/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java
deleted file mode 100644
index a2447ab7..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALRequestBrokerImpl.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * Copyright 2008 Federal Chancellery Austria and
- * Graz University of Technology
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package at.gv.egiz.stal.service.impl;
-
-import at.gv.egiz.stal.ErrorResponse;
-import at.gv.egiz.stal.HashDataInput;
-import at.gv.egiz.stal.QuitRequest;
-import at.gv.egiz.stal.STALRequest;
-import at.gv.egiz.stal.STALResponse;
-import at.gv.egiz.stal.SignRequest;
-import at.gv.egiz.stal.service.translator.STALTranslator;
-import at.gv.egiz.stal.service.translator.TranslationException;
-import at.gv.egiz.stal.service.types.ObjectFactory;
-import at.gv.egiz.stal.service.types.QuitRequestType;
-import at.gv.egiz.stal.service.types.RequestType;
-import at.gv.egiz.stal.service.types.ResponseType;
-import at.gv.egiz.stalx.service.translator.STALXTranslationHandler;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * An instance of STALRequestBroker is shared between a producer thread (SLCommand)
- * and multiple consumer threads (STALService).
- * This implementation assures that handleRequest is executed only once the previous invocation returned.
- * The BindingProcessor assures that a new SLCommand calls handleRequest() only once
- * the bindingProcessor called handleRequest(QUIT) after the previous SLCommand's handleRequest() returned.
- * 
- * Multiple STALService threads might call nextRequest()/getSignedReferences() in any order.
- * 
- * @author clemens
- */
-public class STALRequestBrokerImpl implements STALRequestBroker {
-
-    private static final Log log = LogFactory.getLog(STALRequestBrokerImpl.class);
-
-    private ObjectFactory of = new ObjectFactory();
-    private STALTranslator translator = new STALTranslator();
-    
-    private boolean interrupted = false;
-    
-    protected final ArrayList<JAXBElement<? extends RequestType>> requests;
-    protected final ArrayList<JAXBElement<? extends ResponseType>> responses;
-
-    protected ArrayList<HashDataInput> hashDataInputs;
-    
-    private long timeout;
-
-    public STALRequestBrokerImpl(long timeoutMillisec) {
-      if (timeoutMillisec <= 0) 
-        timeoutMillisec = DEFAULT_TIMEOUT_MS;
-      timeout = timeoutMillisec;
-      requests = new ArrayList<JAXBElement<? extends RequestType>>();
-      responses = new ArrayList<JAXBElement<? extends ResponseType>>();
-      hashDataInputs = new ArrayList<HashDataInput>();
-
-      // register handler for STAL-X
-      translator.registerTranslationHandler(new STALXTranslationHandler());
-    }
-    
-    /**
-     * Produce requests (and HashDataInputCallback) and wait for responses.
-     * This method is not thread safe, since every bindingprocessor thread possesses it's own instance.
-     * It however assures cooperation with STAL webservice threads consuming the requests and producing responses.
-     * 
-     * @param requests
-     * @return
-     * 
-     * @pre requests: either single SignRequest, QuitRequest or multiple ReadInfoboxRequests
-     */
-    @Override
-    public List<STALResponse> handleRequest(List<? extends STALRequest> stalRequests) {
-      if (interrupted) {
-        return null;
-      }
-        try {
-          synchronized (requests) {
-            log.trace("produce request");
-
-            requests.clear();
-            hashDataInputs.clear();
-            
-            for (STALRequest stalRequest : stalRequests) {
-              try {
-                JAXBElement<? extends RequestType> request = translator.translate(stalRequest);
-                requests.add(request);
-                if (stalRequest instanceof SignRequest) {
-                  //TODO refactor SignRequestType to keep HDI
-                  // and getHashDataInput() accesses request obj
-                  // (requests are cleared only when we receive the response)
-                  // DataObjectHashDataInput with reference caching enabled DataObject
-                  hashDataInputs.addAll(((SignRequest) stalRequest).getHashDataInput());
-                } else if (stalRequest instanceof QuitRequest) {
-                  log.trace("Received QuitRequest, do not wait for responses.");
-                  log.trace("notifying request consumers");
-                  requests.notify();
-                  return new ArrayList<STALResponse>();
-                }
-              } catch (TranslationException ex) {
-                log.error(ex.getMessage() + ", send QUIT");
-                requests.clear();
-                QuitRequestType reqT = of.createQuitRequestType();
-                JAXBElement<QuitRequestType> req = of.createGetNextRequestResponseTypeQuitRequest(reqT);
-                requests.add(req);
-                log.trace("notifying request consumers");
-                requests.notify();
-                return new ArrayList<STALResponse>();
-              }
-            }
-              
-
-//                if (stalRequest instanceof SignRequest) {
-//                  log.trace("Received SignRequest, keep HashDataInput.");
-//                  SignRequestType reqT = of.createSignRequestType();
-//                  reqT.setKeyIdentifier(((SignRequest) stalRequest).getKeyIdentifier());
-//                  reqT.setSignedInfo(((SignRequest) stalRequest).getSignedInfo());
-//                  JAXBElement<SignRequestType> req = of.createGetNextRequestResponseTypeSignRequest(reqT);
-//                  requests.add(req);
-//                  //DataObjectHashDataInput with reference caching enabled DataObject
-//                  hashDataInputs.addAll(((SignRequest) stalRequest).getHashDataInput());
-//                  break;
-//                } else if (stalRequest instanceof InfoboxReadRequest) {
-//                  log.trace("Received InfoboxReadRequest");
-//                  InfoboxReadRequestType reqT = new InfoboxReadRequestType();
-//                  reqT.setInfoboxIdentifier(((InfoboxReadRequest) stalRequest).getInfoboxIdentifier());
-//                  reqT.setDomainIdentifier(((InfoboxReadRequest) stalRequest).getDomainIdentifier());
-//                  JAXBElement<InfoboxReadRequestType> req = of.createGetNextRequestResponseTypeInfoboxReadRequest(reqT);
-//                  requests.add(req);
-//                } else if (stalRequest instanceof QuitRequest) {
-//                  log.trace("Received QuitRequest, do not wait for responses.");
-//                  QuitRequestType reqT = of.createQuitRequestType();
-//                  JAXBElement<QuitRequestType> req = of.createGetNextRequestResponseTypeQuitRequest(reqT);
-//                  requests.add(req);
-//                  log.trace("notifying request consumers");
-//                  requests.notify();
-//                  return new ArrayList<STALResponse>();
-//                } else {
-//                  log.error("Received unsupported STAL request: " + stalRequest.getClass().getName() + ", send QUIT");
-//                  requests.clear();
-//                  QuitRequestType reqT = of.createQuitRequestType();
-//                  JAXBElement<QuitRequestType> req = of.createGetNextRequestResponseTypeQuitRequest(reqT);
-//                  requests.add(req);
-//                  log.trace("notifying request consumers");
-//                  requests.notify();
-//                  return new ArrayList<STALResponse>();
-//                }
-//            }
-            log.trace("notifying request consumers");
-            requests.notify();
-          }
-          
-          synchronized (responses) { 
-            long beforeWait = System.currentTimeMillis();
-            while (responses.isEmpty()) {
-                log.trace("waiting to consume response");
-                responses.wait(timeout);
-                if (System.currentTimeMillis() - beforeWait >= timeout) {
-                    log.warn("timeout while waiting to consume response, cleanup requests");
-                    requests.clear(); 
-                    hashDataInputs.clear();
-                    return Collections.singletonList((STALResponse) new ErrorResponse(ERR_4500));
-                }
-            }
-            log.trace("consuming responses");
-            List<STALResponse> stalResponses = new ArrayList<STALResponse>();
-            try {
-              for (JAXBElement<? extends ResponseType> resp : responses) {
-                  STALResponse stalResp = translator.translate(resp);
-                  stalResponses.add(stalResp);
-              }
-            } catch (TranslationException ex) {
-              log.error(ex.getMessage() + ", return ErrorResponse (4000)");
-              ErrorResponse stalResp = new ErrorResponse(4000);
-              stalResp.setErrorMessage(ex.getMessage());
-              stalResponses = Collections.singletonList((STALResponse) stalResp);
-            }
-
-            responses.clear();
-            log.trace("notifying response producers");
-            responses.notify();
-
-            return stalResponses;
-          }
-        } catch (InterruptedException ex) {
-            log.warn("interrupt in handleRequest(): " + ex.getMessage());
-            interrupted = true;
-            return null;
-        }
-    }
-
-    @Override
-    public List<JAXBElement<? extends RequestType>> connect() {
-      if (interrupted) {
-        return null;
-      }
-        try {
-          synchronized (requests) {
-            long beforeWait = System.currentTimeMillis();
-            while (requests.isEmpty()) {
-                log.trace("waiting to consume request");
-                requests.wait(timeout);
-                if (System.currentTimeMillis() - beforeWait >= timeout) {
-                    log.warn("timeout while waiting to consume request");
-                    return createSingleQuitRequest();
-                }
-            }
-            log.trace("don't consume request now, leave for further connect calls");
-            return requests;
-          }
-        } catch (InterruptedException ex) {
-            log.warn("interrupt in nextRequest(): " + ex.getMessage());
-            interrupted = true;
-            return null;
-        }
-    }
-    
-    /**
-     * This method is thread-safe, except for 
-     * an 'initial' call to nextRequest(null) followed by a
-     * 'zombie' call to nextRequest(notNull). 
-     * This case (per design) leads to a timeout of the original call.
-     * (synchronizing the entire method does not 
-     * hinder the zombie to interrupt two consecutive nextRequest() calls.)
-     * 
-     * @param responses
-     * @return QUIT if expected responses are not provided
-     */
-    @Override
-    public List<JAXBElement<? extends RequestType>> nextRequest(List<JAXBElement<? extends ResponseType>> resps) {
-      if (interrupted) {
-        return null;
-      }
-        try {
-          synchronized (requests) {
-            log.trace("received responses, now consume request");
-            if (requests.size() != 0) {
-              requests.clear();
-            } else {
-              log.warn("requests queue is empty, response might have already been produced previously ");
-              // return QUIT?
-            }
-          }
-          
-          synchronized (responses) { 
-            if (resps != null && resps.size() > 0) {
-                long beforeWait = System.currentTimeMillis();
-                while (!responses.isEmpty()) {
-                    log.trace("waiting to produce response");
-                    responses.wait(timeout);
-                    if (System.currentTimeMillis() - beforeWait >= timeout) {
-                        log.warn("timeout while waiting to produce response");
-                        return createSingleQuitRequest();
-                    }
-                }
-                log.trace("produce response");
-                responses.addAll(resps);
-                //reset HashDataInputCallback iff SignResponse
-                if (log.isTraceEnabled()) {
-                    for (JAXBElement<? extends ResponseType> response : resps) {
-                        log.trace("Received STAL response: " + response.getValue().getClass().getName());
-                    }
-                }
-                log.trace("notifying response consumers");
-                responses.notify();
-            } else {
-              log.error("Received NextRequest without responses, return QUIT");
-              return createSingleQuitRequest();
-            }
-          }
-          
-          synchronized (requests) { 
-            long beforeWait = System.currentTimeMillis();
-            while (requests.isEmpty()) {
-                log.trace("waiting to consume request");
-                requests.wait(timeout);
-                if (System.currentTimeMillis() - beforeWait >= timeout) {
-                    log.warn("timeout while waiting to consume request");
-                    return createSingleQuitRequest();
-                }
-            }
-            log.trace("don't consume request now, but on next response delivery");
-            return requests;
-          }
-        } catch (InterruptedException ex) {
-            log.warn("interrupt in nextRequest(): " + ex.getMessage());
-            interrupted = true;
-            return null;
-        }
-    }
-
-    @Override
-    public List<HashDataInput> getHashDataInput() {
-      synchronized (requests) {
-        log.trace("return " + hashDataInputs.size() + " current HashDataInput(s) ");
-        return hashDataInputs;
-      }
-    }
-    
-    private List<JAXBElement<? extends RequestType>> createSingleQuitRequest() {
-      QuitRequestType quitT = of.createQuitRequestType();
-      JAXBElement<QuitRequestType> quit = of.createGetNextRequestResponseTypeQuitRequest(quitT);
-      ArrayList<JAXBElement<? extends RequestType>> l = new ArrayList<JAXBElement<? extends RequestType>>();
-      l.add(quit);
-      return l;
-    }
-}
diff --git a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java b/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
deleted file mode 100644
index c8ab280f..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
+++ /dev/null
@@ -1,386 +0,0 @@
-    /*
- * Copyright 2008 Federal Chancellery Austria and
- * Graz University of Technology
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package at.gv.egiz.stal.service.impl;
-
-import at.buergerkarte.namespaces.cardchannel.service.CommandAPDUType;
-import at.buergerkarte.namespaces.cardchannel.service.ScriptType;
-import at.gv.egiz.bku.binding.BindingProcessor;
-import at.gv.egiz.bku.binding.BindingProcessorManager;
-import at.gv.egiz.bku.binding.Id;
-import at.gv.egiz.bku.binding.IdFactory;
-
-import at.gv.egiz.stal.HashDataInput;
-import at.gv.egiz.stal.service.GetHashDataInputFault;
-import at.gv.egiz.stal.service.STALPortType;
-import at.gv.egiz.stal.service.types.ErrorResponseType;
-import at.gv.egiz.stal.service.types.GetHashDataInputFaultType;
-import at.gv.egiz.stal.service.types.GetHashDataInputResponseType;
-import at.gv.egiz.stal.service.types.GetHashDataInputType;
-import at.gv.egiz.stal.service.types.GetNextRequestResponseType;
-import at.gv.egiz.stal.service.types.GetNextRequestType;
-import at.gv.egiz.stal.service.types.InfoboxReadRequestType;
-import at.gv.egiz.stal.service.types.QuitRequestType;
-import at.gv.egiz.stal.service.types.RequestType;
-import at.gv.egiz.stal.service.types.ResponseType;
-import at.gv.egiz.stal.service.types.SignRequestType;
-import at.gv.egiz.stal.service.types.GetHashDataInputType.Reference;
-//import at.gv.egiz.stal.service.types.GetHashDataInputResponseType.Reference;
-
-import com.sun.xml.ws.developer.UsesJAXBContext;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Resource;
-import javax.jws.WebService;
-import javax.servlet.ServletContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * 
- * @author clemens
- */
-@WebService(endpointInterface = "at.gv.egiz.stal.service.STALPortType", portName="STALPort", serviceName="STALService", targetNamespace="http://www.egiz.gv.at/wsdl/stal", wsdlLocation="WEB-INF/wsdl/stal.wsdl")
-@UsesJAXBContext(STALXJAXBContextFactory.class)
-public class STALServiceImpl implements STALPortType {
-
-  public static final String BINDING_PROCESSOR_MANAGER = "bindingProcessorManager";
-  public static final Id TEST_SESSION_ID = IdFactory.getInstance().createId("TestSession");
-  protected static final Log log = LogFactory.getLog(STALServiceImpl.class);
-
-
-  static {
-    if (log.isTraceEnabled()) {
-      log.trace("enabling webservice communication dump");
-      System.setProperty("com.sun.xml.ws.transport.http.HttpAdapter.dump", "true");
-    } else {
-      System.setProperty("com.sun.xml.ws.fault.SOAPFaultBuilder.disableCaptureStackTrace", "false");
-    }
-  }
-  @Resource
-  protected WebServiceContext wsContext;
-  protected IdFactory idF = IdFactory.getInstance();
-  /** JAXB ObjectFactories */
-  private at.gv.egiz.stal.service.types.ObjectFactory stalObjFactory = new at.gv.egiz.stal.service.types.ObjectFactory();
-  /** don't confuse with at.buergerkarte.namespaces.cardchannel */
-  private at.buergerkarte.namespaces.cardchannel.service.ObjectFactory ccObjFactory = new at.buergerkarte.namespaces.cardchannel.service.ObjectFactory();
-
-  @Override
-  public GetNextRequestResponseType connect(String sessId) {
-
-    if (sessId == null) {
-      throw new NullPointerException("No session id provided");
-    }
-
-    Id sessionId = idF.createId(sessId);
-
-    if (log.isDebugEnabled()) {
-      log.debug("Received Connect [" + sessionId + "]");
-    }
-
-    if (TEST_SESSION_ID.equals(sessionId)) {
-      return getTestSessionNextRequestResponse(null);
-    }
-
-    GetNextRequestResponseType response = new GetNextRequestResponseType();
-    response.setSessionId(sessionId.toString());
-
-    STALRequestBroker stal = getStal(sessionId);
-
-    if (stal != null) {
-
-      List<JAXBElement<? extends RequestType>> requestsOut = ((STALRequestBroker) stal).connect();
-      response.getInfoboxReadRequestOrSignRequestOrQuitRequest().addAll(requestsOut);
-
-      if (log.isDebugEnabled()) {
-        StringBuilder sb = new StringBuilder("Returning initial GetNextRequestResponse [");
-        sb.append(sessionId.toString());
-        sb.append("] containing ");
-        sb.append(requestsOut.size());
-        sb.append(" requests: ");
-        for (JAXBElement<? extends RequestType> reqOut : requestsOut) {
-          sb.append(reqOut.getValue().getClass());
-          sb.append(' ');
-        }
-        log.debug(sb.toString());
-      }
-    } else {
-      log.error("Failed to get STAL for session " + sessionId + ", returning QuitRequest");
-      QuitRequestType quitT = stalObjFactory.createQuitRequestType();
-      JAXBElement<QuitRequestType> quit = stalObjFactory.createGetNextRequestResponseTypeQuitRequest(quitT);
-      response.getInfoboxReadRequestOrSignRequestOrQuitRequest().add(quit);
-    }
-    return response;
-  }
-
-  @Override
-  public GetNextRequestResponseType getNextRequest(GetNextRequestType request) {
-
-    if (request.getSessionId() == null) {
-      throw new NullPointerException("No session id provided");
-    }
-
-    Id sessionId = idF.createId(request.getSessionId());
-
-    List<JAXBElement<? extends ResponseType>> responsesIn = request.getInfoboxReadResponseOrSignResponseOrErrorResponse();
-//    List<ResponseType> responsesIn = request.getInfoboxReadResponseOrSignResponseOrErrorResponse();//getResponse();
-
-    if (log.isDebugEnabled()) {
-      StringBuilder sb = new StringBuilder("Received GetNextRequest [");
-      sb.append(sessionId.toString());
-      sb.append("] containing ");
-      sb.append(responsesIn.size());
-      sb.append(" responses: ");
-      for (JAXBElement<? extends ResponseType> respIn : responsesIn) {
-        sb.append(respIn.getValue().getClass());
-        sb.append(' ');
-      }
-      log.debug(sb.toString());
-    }
-
-    if (TEST_SESSION_ID.equals(sessionId)) {
-      return getTestSessionNextRequestResponse(responsesIn);
-    }
-
-    GetNextRequestResponseType response = new GetNextRequestResponseType();
-    response.setSessionId(sessionId.toString());
-
-    STALRequestBroker stal = getStal(sessionId);
-
-    if (stal != null) {
-
-      List<JAXBElement<? extends RequestType>> requestsOut = ((STALRequestBroker) stal).nextRequest(responsesIn);
-      response.getInfoboxReadRequestOrSignRequestOrQuitRequest().addAll(requestsOut);
-
-      if (log.isDebugEnabled()) {
-        StringBuilder sb = new StringBuilder("Returning GetNextRequestResponse [");
-        sb.append(sessionId.toString());
-        sb.append("] containing ");
-        sb.append(requestsOut.size());
-        sb.append(" requests: ");
-        for (JAXBElement<? extends RequestType> reqOut : requestsOut) {
-          sb.append(reqOut.getValue().getClass());
-          sb.append(' ');
-        }
-        log.debug(sb.toString());
-      }
-    } else {
-      log.error("Failed to get STAL for session " + sessionId + ", returning QuitRequest");
-      QuitRequestType quitT = stalObjFactory.createQuitRequestType();
-      JAXBElement<QuitRequestType> quit = stalObjFactory.createGetNextRequestResponseTypeQuitRequest(quitT);
-      response.getInfoboxReadRequestOrSignRequestOrQuitRequest().add(quit);
-    }
-    return response;
-  }
-
-  @Override
-  public GetHashDataInputResponseType getHashDataInput(GetHashDataInputType request) throws GetHashDataInputFault {
-
-    if (request.getSessionId() == null) {
-      throw new NullPointerException("No session id provided");
-    }
-
-    Id sessionId = idF.createId(request.getSessionId());
-
-    if (log.isDebugEnabled()) {
-      log.debug("Received GetHashDataInputRequest for session " + sessionId + " containing " + request.getReference().size() + " reference(s)");
-    }
-
-    if (TEST_SESSION_ID.equals(sessionId)) {
-      return getTestSessionHashDataInputResponse(request.getReference());
-    }
-    
-    GetHashDataInputResponseType response = new GetHashDataInputResponseType();
-    response.setSessionId(sessionId.toString());
-
-    STALRequestBroker stal = getStal(sessionId);
-
-    if (stal != null) {
-      List<HashDataInput> hashDataInputs = stal.getHashDataInput();
-
-      if (hashDataInputs != null) {
-
-        Map<String, HashDataInput> hashDataIdMap = new HashMap<String, HashDataInput>();
-        for (HashDataInput hdi : hashDataInputs) {
-          if (log.isTraceEnabled()) {
-            log.trace("Provided HashDataInput for reference " + hdi.getReferenceId());
-          }
-          hashDataIdMap.put(hdi.getReferenceId(), hdi);
-        }
-
-        List<GetHashDataInputType.Reference> reqRefs = request.getReference();
-        for (GetHashDataInputType.Reference reqRef : reqRefs) {
-          String reqRefId = reqRef.getID();
-          HashDataInput reqHdi = hashDataIdMap.get(reqRefId);
-          if (reqHdi == null) {
-            String msg = "Failed to resolve HashDataInput for reference " + reqRefId;
-            log.error(msg);
-            GetHashDataInputFaultType faultInfo = new GetHashDataInputFaultType();
-            faultInfo.setErrorCode(1);
-            faultInfo.setErrorMessage(msg);
-            throw new GetHashDataInputFault(msg, faultInfo);
-          }
-
-          InputStream hashDataIS = reqHdi.getHashDataInput();
-          if (hashDataIS == null) {
-            //HashDataInput not cached?
-            String msg = "Failed to obtain HashDataInput for reference " + reqRefId + ", reference not cached";
-            log.error(msg);
-            GetHashDataInputFaultType faultInfo = new GetHashDataInputFaultType();
-            faultInfo.setErrorCode(1);
-            faultInfo.setErrorMessage(msg);
-            throw new GetHashDataInputFault(msg, faultInfo);
-          }
-          ByteArrayOutputStream baos = null;
-          try {
-            if (log.isDebugEnabled()) {
-              log.debug("Resolved HashDataInput " + reqRefId + " (" + reqHdi.getMimeType() + ";charset=" + reqHdi.getEncoding() + ")");
-            }
-            baos = new ByteArrayOutputStream(hashDataIS.available());
-            int c;
-            while ((c = hashDataIS.read()) != -1) {
-              baos.write(c);
-            }
-            GetHashDataInputResponseType.Reference ref = new GetHashDataInputResponseType.Reference();
-            ref.setID(reqRefId);
-            ref.setMimeType(reqHdi.getMimeType());
-            ref.setEncoding(reqHdi.getEncoding());
-            ref.setFilename(reqHdi.getFilename());
-            ref.setValue(baos.toByteArray());
-            response.getReference().add(ref);
-          } catch (IOException ex) {
-            String msg = "Failed to get HashDataInput for reference " + reqRefId;
-            log.error(msg, ex);
-            GetHashDataInputFaultType faultInfo = new GetHashDataInputFaultType();
-            faultInfo.setErrorCode(1);
-            faultInfo.setErrorMessage(msg);
-            throw new GetHashDataInputFault(msg, faultInfo, ex);
-          } finally {
-            try {
-              baos.close();
-            } catch (IOException ex) {
-            }
-          }
-        }
-        return response;
-      } else {
-        String msg = "Failed to resolve any HashDataInputs for session " + sessionId;
-        log.error(msg);
-        GetHashDataInputFaultType faultInfo = new GetHashDataInputFaultType();
-        faultInfo.setErrorCode(1);
-        faultInfo.setErrorMessage(msg);
-        throw new GetHashDataInputFault(msg, faultInfo);
-      }
-    } else {
-      String msg = "Session timeout"; //Failed to get STAL for session " + sessionId;
-      log.error(msg + " " + sessionId);
-      GetHashDataInputFaultType faultInfo = new GetHashDataInputFaultType();
-      faultInfo.setErrorCode(1);
-      faultInfo.setErrorMessage(msg);
-      throw new GetHashDataInputFault(msg, faultInfo);
-    }
-  }
-
-  private STALRequestBroker getStal(Id sessionId) {
-    if (log.isTraceEnabled()) {
-      log.trace("resolve STAL for session " + sessionId);
-    }
-    MessageContext mCtx = wsContext.getMessageContext();
-    ServletContext sCtx = (ServletContext) mCtx.get(MessageContext.SERVLET_CONTEXT);
-    BindingProcessorManager bpMgr = (BindingProcessorManager) sCtx.getAttribute(BINDING_PROCESSOR_MANAGER);
-    BindingProcessor bp = bpMgr.getBindingProcessor(sessionId);
-    return (bp == null) ? null : (bp.isFinished() ? null : (STALRequestBroker) bp.getSTAL());
-  }
-
-  private GetNextRequestResponseType getTestSessionNextRequestResponse(List<JAXBElement<? extends ResponseType>> responsesIn) {
-    GetNextRequestResponseType response = new GetNextRequestResponseType();
-    response.setSessionId(TEST_SESSION_ID.toString());
-
-    List<JAXBElement<? extends RequestType>> reqs = response.getInfoboxReadRequestOrSignRequestOrQuitRequest();
-
-    if (responsesIn == null) {
-      log.info("[TestSession] CONNECT");
-//      addTestCardChannelRequest(reqs);
-//      addTestInfoboxReadRequest("IdentityLink", reqs);
-//      addTestInfoboxReadRequest("SecureSignatureKeypair", reqs);
-//      addTestInfoboxReadRequest("CertifiedKeypair", reqs);
-      addTestSignatureRequests("SecureSignatureKeypair", reqs);
-    } else if (responsesIn != null && responsesIn.size() > 0 && responsesIn.get(0).getValue() instanceof ErrorResponseType) {
-      log.info("[TestSession] received ErrorResponse, return QUIT request");
-      QuitRequestType quitT = stalObjFactory.createQuitRequestType();
-      reqs.add(stalObjFactory.createGetNextRequestResponseTypeQuitRequest(quitT));
-    } else {
-      log.info("[TestSession] received " + responsesIn.size() + " response(s), return QUIT" );
-      QuitRequestType quitT = stalObjFactory.createQuitRequestType();
-      reqs.add(stalObjFactory.createGetNextRequestResponseTypeQuitRequest(quitT));
-    }
-    return response;
-  }
-  
-  
-  private GetHashDataInputResponseType getTestSessionHashDataInputResponse(List<Reference> references) {
-    log.debug("[TestSession] received GET_HASHDATAINPUT");
-    
-    GetHashDataInputResponseType response = new GetHashDataInputResponseType();
-    response.setSessionId(TEST_SESSION_ID.toString());
-    
-    for (Reference reference : references) {
-      String refId = reference.getID();
-      log.debug("[TestSession] adding hashdata input for " + refId);
-      GetHashDataInputResponseType.Reference ref = new GetHashDataInputResponseType.Reference();
-      ref.setID(refId);
-      ref.setMimeType(TestSignatureData.HASHDATA_MIMETYPES.get(refId)); //todo resolve from TestSignatureData
-      ref.setValue(TestSignatureData.HASHDATA_INPUT.get(refId));
-      ref.setEncoding(TestSignatureData.ENCODING);
-      response.getReference().add(ref);
-    }
-    return response;
-  }
-  
-  private void addTestCardChannelRequest(List<JAXBElement<? extends RequestType>> requestList) {
-    log.info("[TestSession] add CARDCHANNEL request");
-    ScriptType scriptT = ccObjFactory.createScriptType();
-    CommandAPDUType cmd = ccObjFactory.createCommandAPDUType();
-    cmd.setValue("TestSession CardChannelCMD 1234".getBytes());
-    scriptT.getResetOrCommandAPDUOrVerifyAPDU().add(cmd);
-    requestList.add(ccObjFactory.createScript(scriptT));
-  }
-
-  private void addTestInfoboxReadRequest(String infoboxIdentifier, List<JAXBElement<? extends RequestType>> requestList) {
-    log.info("[TestSession] add READ "+ infoboxIdentifier + " request");
-    InfoboxReadRequestType ibrT = stalObjFactory.createInfoboxReadRequestType();
-    ibrT.setInfoboxIdentifier(infoboxIdentifier);
-    requestList.add(stalObjFactory.createGetNextRequestResponseTypeInfoboxReadRequest(ibrT));
-  }
-  
-  private void addTestSignatureRequests(String keyIdentifier, List<JAXBElement<? extends RequestType>> reqs) {
-    log.info("[TestSession] add SIGN " + keyIdentifier + " request");
-    SignRequestType sigT = stalObjFactory.createSignRequestType();
-    sigT.setKeyIdentifier(keyIdentifier);
-    sigT.setSignedInfo(TestSignatureData.SIGNED_INFO.get(1)); //select! 
-    reqs.add(stalObjFactory.createGetNextRequestResponseTypeSignRequest(sigT));
-  }
-
-}
diff --git a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALXJAXBContextFactory.java b/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALXJAXBContextFactory.java
deleted file mode 100644
index 9caf950f..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALXJAXBContextFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2008 Federal Chancellery Austria and
- * Graz University of Technology
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package at.gv.egiz.stal.service.impl;
-
-import com.sun.xml.bind.api.JAXBRIContext;
-import com.sun.xml.bind.api.TypeReference;
-import com.sun.xml.ws.api.model.SEIModel;
-import com.sun.xml.ws.developer.JAXBContextFactory;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.JAXBException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- *
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class STALXJAXBContextFactory implements JAXBContextFactory {
-
-  private static final Log log = LogFactory.getLog(STALXJAXBContextFactory.class);
-
-  @Override
-  public JAXBRIContext createJAXBContext(SEIModel sei, List<Class> classesToBind, List<TypeReference> typeReferences) throws JAXBException {
-    if (log.isTraceEnabled()) {
-      log.trace("JAXBContext seed for SEI " + sei.getTargetNamespace() + ":");
-      for (Class class1 : classesToBind) {
-        log.trace(" " + class1);
-      }
-      for (TypeReference typeReference : typeReferences) {
-        log.trace(" typeRef " + typeReference.tagName + " -> " + typeReference.type);
-      }
-    }
-    List<Class> classes = new ArrayList<Class>();
-    classes.addAll(classesToBind);
-    Class ccOF = at.buergerkarte.namespaces.cardchannel.service.ObjectFactory.class;
-    if (!classes.contains(ccOF)) {
-      log.debug("adding " + ccOF + " to JAXBContext seed");
-      classes.add(ccOF);
-    }
-
-    //TODO add typeReference?
-
-    return JAXBRIContext.newInstance(classes.toArray(new Class[classes.size()]),
-            typeReferences, null, sei.getTargetNamespace(), false, null);
-  }
-}
diff --git a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/TestSignatureData.java b/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/TestSignatureData.java
deleted file mode 100644
index 2f58bb3d..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/TestSignatureData.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package at.gv.egiz.stal.service.impl;
-
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-public final class TestSignatureData {
-  
-  protected final static Log log = LogFactory.getLog(TestSignatureData.class);
-  
-  public static final String[] ID = new String[] {"signed-data-reference-0-1214921968-27971781-24309", "signed-data-reference-1"};
-  public static final String ENCODING = "UTF-8";
-  
-  public static final Map<String, byte[]> HASHDATA_INPUT = new HashMap<String, byte[]>();
-  static {
-    try {
-      HASHDATA_INPUT.put(ID[0], "Ich bin ein einfacher Text. lläöü߀".getBytes(ENCODING));
-      HASHDATA_INPUT.put(ID[1], "2te referenz".getBytes(ENCODING));
-    } catch (UnsupportedEncodingException ex) {
-      log.error("failed to init signature test data", ex);
-    }
-  }
-  public static final Map<String, String> HASHDATA_MIMETYPES = new HashMap<String, String>();
-  static {
-      HASHDATA_MIMETYPES.put(ID[0], "text/plain");
-      HASHDATA_MIMETYPES.put(ID[1], "any/mime-type");
-  }
-  
-//  private static final byte[] signedInfo = "<dsig:SignedInfo  xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\"><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-1214921968-27971781-24309\" URI=\"#signed-data-object-0-1214921968-27971781-13578\"><dsig:Transforms> <dsig:Transform Algorithm=\"http://www.w3.org/2002/06/xmldsig-filter2\"> <xpf:XPath xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\" Filter=\"intersect\">id('signed-data-object-0-1214921968-27971781-13578')/node()</xpf:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /> <dsig:DigestValue>H1IePEEfGQ2SG03H6LTzw1TpCuM=</dsig:DigestValue></dsig:Reference><dsig:Reference Id=\"etsi-data-reference-0-1214921968-27971781-25439\" 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-1214921968-27971781-3095')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)\"><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /><dsig:DigestValue>yV6Q+I60buqR4mMaxA7fi+CV35A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo>".getBytes();
-//  private static final byte[] signedInfo2Ref = "<dsig:SignedInfo  xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\"><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-1214921968-27971781-24309\" URI=\"#signed-data-object-0-1214921968-27971781-13578\"><dsig:Transforms> <dsig:Transform Algorithm=\"http://www.w3.org/2002/06/xmldsig-filter2\"> <xpf:XPath xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\" Filter=\"intersect\">id('signed-data-object-0-1214921968-27971781-13578')/node()</xpf:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /> <dsig:DigestValue>H1IePEEfGQ2SG03H6LTzw1TpCuM=</dsig:DigestValue></dsig:Reference><dsig:Reference Id=\"signed-data-reference-1\" URI=\"#signed-data-object-0-1214921968-27971781-13578\"><dsig:Transforms> <dsig:Transform Algorithm=\"http://www.w3.org/2002/06/xmldsig-filter2\"> <xpf:XPath xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\" Filter=\"intersect\">id('signed-data-object-1')/node()</xpf:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /> <dsig:DigestValue>H1IePEEfGQ2SG03H6LTzw1TpCuM=</dsig:DigestValue></dsig:Reference><dsig:Reference Id=\"etsi-data-reference-0-1214921968-27971781-25439\" 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-1214921968-27971781-3095')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)\"><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /><dsig:DigestValue>yV6Q+I60buqR4mMaxA7fi+CV35A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo>".getBytes();
-//  private static final String signedInfo2Ref = "<dsig:Reference Id=\"signed-data-reference-1\" URI=\"#signed-data-object-0-1214921968-27971781-13578\"><dsig:Transforms> <dsig:Transform Algorithm=\"http://www.w3.org/2002/06/xmldsig-filter2\"> <xpf:XPath xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\" Filter=\"intersect\">id('signed-data-object-1')/node()</xpf:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /> <dsig:DigestValue>H1IePEEfGQ2SG03H6LTzw1TpCuM=</dsig:DigestValue></dsig:Reference>";
-  /**
-   * SIGNED_INFO[0] contains reference ID[0]
-   * SIGNED_INFO[1] contains reference ID[0] and ID[1]
-   */
-  public static final List<byte[]> SIGNED_INFO = new ArrayList<byte[]>(); 
-  static {
-    SIGNED_INFO.add("<dsig:SignedInfo  xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\"><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-1214921968-27971781-24309\" URI=\"#signed-data-object-0-1214921968-27971781-13578\"><dsig:Transforms> <dsig:Transform Algorithm=\"http://www.w3.org/2002/06/xmldsig-filter2\"> <xpf:XPath xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\" Filter=\"intersect\">id('signed-data-object-0-1214921968-27971781-13578')/node()</xpf:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /> <dsig:DigestValue>H1IePEEfGQ2SG03H6LTzw1TpCuM=</dsig:DigestValue></dsig:Reference><dsig:Reference Id=\"etsi-data-reference-0-1214921968-27971781-25439\" 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-1214921968-27971781-3095')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)\"><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /><dsig:DigestValue>yV6Q+I60buqR4mMaxA7fi+CV35A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo>".getBytes());
-    SIGNED_INFO.add("<dsig:SignedInfo  xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\" xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\"><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-1214921968-27971781-24309\" URI=\"#signed-data-object-0-1214921968-27971781-13578\"><dsig:Transforms> <dsig:Transform Algorithm=\"http://www.w3.org/2002/06/xmldsig-filter2\"> <xpf:XPath xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\" Filter=\"intersect\">id('signed-data-object-0-1214921968-27971781-13578')/node()</xpf:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /> <dsig:DigestValue>H1IePEEfGQ2SG03H6LTzw1TpCuM=</dsig:DigestValue></dsig:Reference><dsig:Reference Id=\"signed-data-reference-1\" URI=\"#signed-data-object-0-1214921968-27971781-13578\"><dsig:Transforms> <dsig:Transform Algorithm=\"http://www.w3.org/2002/06/xmldsig-filter2\"> <xpf:XPath xmlns:xpf=\"http://www.w3.org/2002/06/xmldsig-filter2\" Filter=\"intersect\">id('signed-data-object-1')/node()</xpf:XPath></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /> <dsig:DigestValue>H1IePEEfGQ2SG03H6LTzw1TpCuM=</dsig:DigestValue></dsig:Reference><dsig:Reference Id=\"etsi-data-reference-0-1214921968-27971781-25439\" 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-1214921968-27971781-3095')/child::etsi:QualifyingProperties/child::etsi:SignedProperties)\"><dsig:DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\" /><dsig:DigestValue>yV6Q+I60buqR4mMaxA7fi+CV35A=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo>".getBytes());
-  }
-  
-}
diff --git a/mocca-1.2.11/BKUOnline/src/main/policy/50mocca.policy b/mocca-1.2.11/BKUOnline/src/main/policy/50mocca.policy
deleted file mode 100644
index 2d6bc13d..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/policy/50mocca.policy
+++ /dev/null
@@ -1,319 +0,0 @@
-//  Copyright 2008 Federal Chancellery Austria and
-//  Graz University of Technology
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-//
-// =========================================================================
-// || IMPORTANT: REVIEW AND ADAPT TO YOUR NEEDS PRIOR TO INSTALLATION
-// =========================================================================
-//
-// (set -Djava.security.debug=access,failure and search for "FAILED")
-//
-//
-// ========== MOCCA CODE PERMISSIONS =======================================
-//
-// replace  ${catalina.base}/webapps/bkuonline
-//    with  ${catalina.base}/webapps/<mocca_context>
-// replace  ${catalina.base}/work/Catalina/localhost/bkuonline
-//    with  ${catalina.base}/work/Catalina/localhost/<mocca_context> (the path to the compiled JSPs, excl. package dir: org/apache/jsp/)
-// replace  version info in utils-1.2.10.jar and bkucommon-1.2.10.jar
-//    with  current version
-// replace  apps.egiz.gv.at
-//    with  <DataURL_host:DataURL_port>
-// replace  localhost:8080
-//    with  <StylesheetURL_host:StylesheetURL_port>
-// replace  www.xslt-stylesheet-include-url.org:80
-//    with  <XSL_include_URL>
-// replace  ../conf/secret.xml
-//    with  <any_resource_you_would_like_to_grant_XSLTs_document()_function_access_to>
-//
-// replace  www.a-trust.at and ksp.ecard.sozialversicherung.gv.at
-//    with  <idLink_template_download_URL>
-// replace  ldap.a-trust.at:389 and ocsp.ecard.sozialversicherung.at:80
-//    with  <certificate_revocation_authority_endpoint> (OCSP, CRLs)
-//
-
-// =========== container grants required by MOCCA
-//
-grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" {
-      permission java.lang.RuntimePermission "accessClassInPackage.sun.util.logging.resources";
-      permission java.io.FilePermission "${catalina.base}/webapps/bkuonline/WEB-INF/classes/logging.properties", "read";
-};
-
-grant codeBase "file:${catalina.base}/work/Catalina/localhost/bkuonline" {
-      permission java.io.FilePermission "/helpfiles/-", "read";
-      permission java.lang.RuntimePermission "defineClassInPackage.org.apache.jasper.runtime";
-};
-
-// =========== MOCCA grants
-//
-grant codeBase "file:${catalina.base}/webapps/bkuonline/WEB-INF/classes/-" {
-      permission java.security.AllPermission;
-//      permission java.io.FilePermission "${catalina.base}/logs", "read, write";
-//      permission java.io.FilePermission "${catalina.base}/logs/*", "read, write";
-//      permission java.io.FilePermission "${catalina.base}/logs/*", "delete";
-//      permission java.util.PropertyPermission "com.sun.xml.ws.fault.SOAPFaultBuilder.disableCaptureStackTrace", "write";
-//      permission java.util.PropertyPermission "com.sun.xml.ws.transport.http.HttpAdapter.dump", "write";
-};
-
-grant codeBase "file:${catalina.base}/webapps/bkuonline/WEB-INF/lib/-" {
-      // the log4j configuration might want to write logs to ${catalina.base}/logs/bkuonline.log
-      permission java.io.FilePermission "${catalina.base}/logs", "read, write";
-      permission java.io.FilePermission "${catalina.base}/logs/*", "read, write";
-      permission java.io.FilePermission "${catalina.base}/logs/*", "delete";
-
-};
-
-grant codeBase "file:${catalina.base}/webapps/bkuonline/WEB-INF/lib/utils-1.2.10.jar" {
-      permission java.util.PropertyPermission "*", "read";
-      permission java.net.SocketPermission "www.a-trust.at:80", "connect, resolve";
-      permission java.net.SocketPermission "ksp.ecard.sozialversicherung.gv.at:80", "connect,resolve";
-//      permission java.net.SocketPermission "localhost:8080", "connect, resolve";
-      permission java.net.SocketPermission "www.xslt-stylesheet-include-url.org:80", "connect, resolve";
-      permission java.lang.RuntimePermission "accessDeclaredMembers";
-      permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
-};
-
-grant codeBase "file:${catalina.base}/webapps/bkuonline/WEB-INF/lib/bkucommon-1.2.10.jar" {
-      permission java.io.FilePermission "${catalina.base}/webapps/bkuonline/WEB-INF/classes/at/gv/egiz/bku/certs/certStore", "write";
-      permission java.io.FilePermission "${catalina.base}/webapps/bkuonline/WEB-INF/classes/at/gv/egiz/bku/certs/certStore/-", "write";
-      permission java.io.FilePermission "${catalina.base}/webapps/bkuonline/WEB-INF/classes/at/gv/egiz/bku/certs/certStore/toBeAdded/-", "delete";
-      permission java.io.FilePermission "../conf/secret.xml", "read";
-      permission java.net.SocketPermission "apps.egiz.gv.at:443", "connect, resolve";
-      permission java.net.SocketPermission "www.a-trust.at:80", "connect, resolve";
-      permission java.net.SocketPermission "ksp.ecard.sozialversicherung.gv.at:80", "connect,resolve";
-      permission java.net.SocketPermission "ldap.a-trust.at:389", "connect, resolve";
-      permission java.net.SocketPermission "ocsp.ecard.sozialversicherung.at:80", "connect, resolve";
-//      permission java.net.SocketPermission "localhost:8080", "connect, resolve";
-      permission java.net.SocketPermission "www.xslt-stylesheet-include-url.org:80", "connect, resolve";
-      permission java.net.NetPermission "specifyStreamHandler";
-      permission java.util.PropertyPermission "*", "read, write";
-      permission java.security.SecurityPermission "insertProvider.IAIK";
-      permission java.security.SecurityPermission "putProviderProperty.IAIK";
-      permission java.security.SecurityPermission "removeProvider.IAIK";
-      permission java.security.SecurityPermission "insertProvider.IAIK_ECC";
-      permission java.security.SecurityPermission "putProviderProperty.IAIK_ECC";
-      permission java.security.SecurityPermission "insertProvider.XSECT";
-      permission java.security.SecurityPermission "putProviderProperty.XSECT";
-      permission java.security.SecurityPermission "insertProvider.STAL";
-      permission java.security.SecurityPermission "putProviderProperty.STAL";
-      // XMLDSig is moved backwards by XSECT
-      permission java.security.SecurityPermission "insertProvider.XMLDSig";
-      permission java.security.SecurityPermission "removeProvider.XMLDSig";
-      permission java.lang.RuntimePermission "accessDeclaredMembers";
-      permission java.lang.RuntimePermission "setFactory";
-      permission java.lang.RuntimePermission "getProtectionDomain";
-      permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.protocol.ldap";
-      permission java.lang.RuntimePermission "modifyThread";
-      permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
-};
-
-grant codeBase "file:${catalina.base}/webapps/bkuonline/WEB-INF/lib/iaik_jce_full_signed-3.16.jar" {
-      permission java.util.PropertyPermission "*", "read, write";
-      permission java.security.SecurityPermission "insertProvider.IAIK";
-      permission java.security.SecurityPermission "putProviderProperty.IAIK";
-      permission java.security.SecurityPermission "removeProvider.IAIK";
-      permission java.net.SocketPermission "ldap.a-trust.at:389", "connect, resolve";
-      permission java.net.SocketPermission "ocsp.ecard.sozialversicherung.at:80", "connect, resolve";
-};
-
-grant codeBase "file:${catalina.base}/webapps/bkuonline/WEB-INF/lib/iaik_ecc_signed-2.15.jar" {
-      permission java.security.SecurityPermission "insertProvider.IAIK_ECC";
-      permission java.security.SecurityPermission "putProviderProperty.IAIK_ECC";
-};
-
-grant codeBase "file:${catalina.base}/webapps/bkuonline/WEB-INF/lib/iaik_xsect-1.14.jar" {
-      permission java.util.PropertyPermission "*", "read, write";
-      permission java.security.SecurityPermission "insertProvider.IAIK";
-      permission java.security.SecurityPermission "putProviderProperty.IAIK";
-      permission java.security.SecurityPermission "removeProvider.IAIK";
-      permission java.security.SecurityPermission "insertProvider.XSECT";
-      permission java.security.SecurityPermission "putProviderProperty.XSECT";
-      permission java.security.SecurityPermission "insertProvider.XMLDSig";
-      permission java.security.SecurityPermission "removeProvider.XMLDSig";
-};
-
-grant codeBase "file:${catalina.base}/webapps/bkuonline/WEB-INF/lib/iaik_pki-1.0-MOCCA.jar" {
-      permission java.io.FilePermission "${catalina.base}/webapps/bkuonline/WEB-INF/classes/at/gv/egiz/bku/certs/certStore", "write";
-      permission java.io.FilePermission "${catalina.base}/webapps/bkuonline/WEB-INF/classes/at/gv/egiz/bku/certs/certStore/-", "write";
-      permission java.io.FilePermission "${catalina.base}/webapps/bkuonline/WEB-INF/classes/at/gv/egiz/bku/certs/certStore/toBeAdded/-", "delete";
-      permission java.net.SocketPermission "www.a-trust.at:80", "connect, resolve";
-      permission java.net.SocketPermission "ldap.a-trust.at:389", "connect, resolve";
-      permission java.net.SocketPermission "ocsp.ecard.sozialversicherung.at:80", "connect, resolve";
-      permission java.net.NetPermission "specifyStreamHandler";
-      permission java.lang.RuntimePermission "accessClassInPackage.sun.net.www.protocol.ldap";
-};
-
-grant codeBase "file:${catalina.base}/webapps/bkuonline/WEB-INF/lib/xalan-2.7.1.jar" {
-      permission java.io.FilePermission "${java.home}/lib/xalan.properties", "read";
-      permission java.util.PropertyPermission "*", "read";
-      permission java.lang.RuntimePermission "getClassLoader";
-};
-
-grant codeBase "file:${catalina.base}/webapps/bkuonline/WEB-INF/lib/serializer-2.7.1.jar" {
-      permission java.util.PropertyPermission "*", "read";
-      permission java.lang.RuntimePermission "getClassLoader";
-};
-
-// allow xsl:include from the specified URL
-grant codeBase "jar:file:${catalina.base}/webapps/bkuonline/WEB-INF/lib/xalan-2.7.1.jar!/org/apache/xalan/processor/-" {
-      permission java.net.SocketPermission "www.xslt-stylesheet-include-url.org:80", "connect, resolve";
-};
-
-// allow XSLT document function to reference the specified URL
-grant codeBase "jar:file:${catalina.base}/webapps/bkuonline/WEB-INF/lib/xalan-2.7.1.jar!/org/apache/xalan/xsltc/dom/LoadDocument.class" {
-      permission java.io.FilePermission "../conf/secret.xml", "read";
-};
-
-// use tomcat/jre endorsed xerces instead
-grant codeBase "file:${catalina.base}/webapps/bkuonline/WEB-INF/lib/xercesImpl-2.9.1.jar" {
-      permission java.io.FilePermission "${java.home}/lib/xerces.properties", "read";
-//      permission java.io.FilePermission "../conf/secret.xml", "read";
-//      permission java.net.SocketPermission "www.xslt-stylesheet-include-url.org:80", "connect, resolve";
-      permission java.util.PropertyPermission "*", "read";
-      permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina";
-      permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.*";
-      permission java.lang.RuntimePermission "getClassLoader";
-      permission java.lang.RuntimePermission "accessDeclaredMembers";
-};
-
-grant codeBase "file:${catalina.base}/webapps/bkuonline/WEB-INF/lib/commons-logging-1.1.1.jar" {
-      permission java.util.PropertyPermission "org.apache.commons.logging.*", "read";
-      permission java.util.PropertyPermission "log4j.*", "read";
-      permission java.util.PropertyPermission "catalina.base", "read";
-      permission java.lang.RuntimePermission "getClassLoader";
-      permission java.lang.RuntimePermission "defineClassInPackage.java.lang";
-};
-
-grant codeBase "file:${catalina.base}/webapps/bkuonline/WEB-INF/lib/log4j-1.2.12.jar" {
-      permission java.io.FilePermission "${catalina.base}/webapps/bkuonline/WEB-INF/classes/log4j.properties", "read";
-      // allow log4j to read its own properties
-      permission java.util.PropertyPermission "log4j.*", "read";
-      permission java.util.PropertyPermission "catalina.base", "read";
-      permission java.lang.RuntimePermission "defineClassInPackage.java.lang";
-};
-
-grant codeBase "file:${catalina.base}/webapps/bkuonline/WEB-INF/lib/spring-core-2.5.5.jar" {
-      permission java.lang.RuntimePermission "accessDeclaredMembers";
-      permission java.lang.RuntimePermission "modifyThread";
-};
-grant codeBase "file:${catalina.base}/webapps/bkuonline/WEB-INF/lib/spring-web-2.5.5.jar" {
-      permission java.io.FilePermission "${catalina.base}/webapps/bkuonline/WEB-INF/classes/at/gv/egiz/bku/certs/certStore", "write";
-      permission java.io.FilePermission "${catalina.base}/webapps/bkuonline/WEB-INF/classes/at/gv/egiz/bku/certs/certStore/-", "write";
-      permission java.io.FilePermission "${catalina.base}/webapps/bkuonline/WEB-INF/classes/at/gv/egiz/bku/certs/certStore/toBeAdded/-", "delete";
-      permission java.security.SecurityPermission "insertProvider.IAIK";
-      permission java.security.SecurityPermission "putProviderProperty.IAIK";
-      permission java.security.SecurityPermission "removeProvider.IAIK";
-      permission java.security.SecurityPermission "insertProvider.IAIK_ECC";
-      permission java.security.SecurityPermission "putProviderProperty.IAIK_ECC";
-      permission java.security.SecurityPermission "insertProvider.XSECT";
-      permission java.security.SecurityPermission "putProviderProperty.XSECT";
-      permission java.security.SecurityPermission "insertProvider.STAL";
-      permission java.security.SecurityPermission "putProviderProperty.STAL";
-      permission java.security.SecurityPermission "insertProvider.XMLDSig";
-      permission java.security.SecurityPermission "removeProvider.XMLDSig";
-      permission java.util.PropertyPermission "*", "read, write";
-      permission java.lang.RuntimePermission "accessDeclaredMembers";
-      permission java.lang.RuntimePermission "modifyThread";
-      permission java.lang.RuntimePermission "setFactory";
-      permission java.lang.RuntimePermission "getProtectionDomain";
-      permission java.lang.RuntimePermission "defineClassInPackage.java.lang";
-      permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
-};
-grant codeBase "file:${catalina.base}/webapps/bkuonline/WEB-INF/lib/spring-beans-2.5.5.jar" {
-      permission java.io.FilePermission "${catalina.base}/webapps/bkuonline/WEB-INF/classes/at/gv/egiz/bku/certs/certStore", "write";
-      permission java.io.FilePermission "${catalina.base}/webapps/bkuonline/WEB-INF/classes/at/gv/egiz/bku/certs/certStore/-", "write";
-      permission java.io.FilePermission "${catalina.base}/webapps/bkuonline/WEB-INF/classes/at/gv/egiz/bku/certs/certStore/toBeAdded/-", "delete";
-      permission java.security.SecurityPermission "insertProvider.IAIK";
-      permission java.security.SecurityPermission "putProviderProperty.IAIK";
-      permission java.security.SecurityPermission "removeProvider.IAIK";
-      permission java.security.SecurityPermission "insertProvider.IAIK_ECC";
-      permission java.security.SecurityPermission "putProviderProperty.IAIK_ECC";
-      permission java.security.SecurityPermission "insertProvider.XSECT";
-      permission java.security.SecurityPermission "putProviderProperty.XSECT";
-      permission java.security.SecurityPermission "insertProvider.STAL";
-      permission java.security.SecurityPermission "putProviderProperty.STAL";
-      permission java.security.SecurityPermission "insertProvider.XMLDSig";
-      permission java.security.SecurityPermission "removeProvider.XMLDSig";
-      permission java.util.PropertyPermission "*", "read, write";
-      permission java.lang.RuntimePermission "accessDeclaredMembers";
-      permission java.lang.RuntimePermission "setFactory";
-      permission java.lang.RuntimePermission "getProtectionDomain";
-      permission java.lang.RuntimePermission "defineClassInPackage.java.lang";
-      permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
-};
-grant codeBase "file:${catalina.base}/webapps/bkuonline/WEB-INF/lib/spring-context-2.5.5.jar" {
-      permission java.io.FilePermission "${catalina.base}/webapps/bkuonline/WEB-INF/classes/at/gv/egiz/bku/certs/certStore", "write";
-      permission java.io.FilePermission "${catalina.base}/webapps/bkuonline/WEB-INF/classes/at/gv/egiz/bku/certs/certStore/-", "write";
-      permission java.io.FilePermission "${catalina.base}/webapps/bkuonline/WEB-INF/classes/at/gv/egiz/bku/certs/certStore/toBeAdded/-", "delete";
-      permission java.security.SecurityPermission "insertProvider.IAIK";
-      permission java.security.SecurityPermission "putProviderProperty.IAIK";
-      permission java.security.SecurityPermission "removeProvider.IAIK";
-      permission java.security.SecurityPermission "insertProvider.IAIK_ECC";
-      permission java.security.SecurityPermission "putProviderProperty.IAIK_ECC";
-      permission java.security.SecurityPermission "insertProvider.XSECT";
-      permission java.security.SecurityPermission "putProviderProperty.XSECT";
-      permission java.security.SecurityPermission "insertProvider.STAL";
-      permission java.security.SecurityPermission "putProviderProperty.STAL";
-      permission java.security.SecurityPermission "insertProvider.XMLDSig";
-      permission java.security.SecurityPermission "removeProvider.XMLDSig";
-      permission java.util.PropertyPermission "*", "read, write";
-      permission java.lang.RuntimePermission "accessDeclaredMembers";
-      permission java.lang.RuntimePermission "modifyThread";
-      permission java.lang.RuntimePermission "setFactory";
-      permission java.lang.RuntimePermission "getProtectionDomain";
-      permission java.lang.RuntimePermission "defineClassInPackage.java.lang";
-      permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
-};
-
-grant codeBase "file:${catalina.base}/webapps/bkuonline/WEB-INF/lib/jaxws-rt-2.1.5.jar" {
-      // need write access to set disableCaptureStackTrace and HttpAdapter.dump
-      permission java.util.PropertyPermission "com.sun.xml.ws.*", "read, write";
-      permission java.util.PropertyPermission "com.sun.xml.bind.*", "read";
-      permission java.util.PropertyPermission "javax.xml.soap.*", "read";
-      permission java.util.PropertyPermission "javax.activation.*", "read";
-      permission java.util.PropertyPermission "xml.catalog.*", "read";
-      permission java.util.PropertyPermission "user.dir", "read";
-      permission java.util.PropertyPermission "user.home", "read";
-      permission java.io.FilePermission "${java.home}/lib/jaxm.properties", "read";
-      permission java.io.FilePermission "${java.home}/lib/mailcap", "read";
-      permission java.io.FilePermission "${user.home}/.mailcap", "read";
-      permission java.io.FilePermission "basename", "read";
-      permission java.io.FilePermission "${catalina.home}/bin/xcatalog", "read";
-      permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
-      permission java.lang.RuntimePermission "accessDeclaredMembers";
-      permission java.lang.RuntimePermission "accessClassInPackage.sun.util.logging.resources";
-      permission java.lang.RuntimePermission "setContextClassLoader";
-      permission javax.management.MBeanServerPermission "createMBeanServer";
-      permission javax.management.MBeanPermission "com.sun.xml.ws.*", "registerMBean";
-      permission javax.management.MBeanTrustPermission "register";
-      permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
-};
-
-grant codeBase "file:${catalina.base}/webapps/bkuonline/WEB-INF/lib/jaxb-impl-2.1.9.jar" {
-      permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
-      permission java.lang.RuntimePermission "accessDeclaredMembers";
-      permission java.util.PropertyPermission "com.sun.xml.bind.v2.*", "read";
-      permission java.util.PropertyPermission "user.dir", "read";
-};
-
-grant codeBase "file:${catalina.base}/webapps/bkuonline/WEB-INF/lib/commons-httpclient-3.1.jar" {
-      permission java.util.PropertyPermission "*", "read";
-};
-
-// ======== NETBEANS
-
-//grant codeBase "file:${catalina.base}/nblib/-" {
-//      permission java.security.AllPermission;
-//};
\ No newline at end of file
diff --git a/mocca-1.2.11/BKUOnline/src/main/resources/at/gv/egiz/bku/online/conf/accessControlConfig.xml b/mocca-1.2.11/BKUOnline/src/main/resources/at/gv/egiz/bku/online/conf/accessControlConfig.xml
deleted file mode 100644
index f8d1411c..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/resources/at/gv/egiz/bku/online/conf/accessControlConfig.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    Copyright 2008 Federal Chancellery Austria and Graz University of

-    Technology Licensed under the Apache License, Version 2.0 (the

-    "License"); you may not use this file except in compliance with the

-    License. You may obtain a copy of the License at

-    http://www.apache.org/licenses/LICENSE-2.0 Unless required by

-    applicable law or agreed to in writing, software distributed under the

-    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR

-    CONDITIONS OF ANY KIND, either express or implied. See the License for

-    the specific language governing permissions and limitations under the

-    License.

-  -->

-<AccessControl>

-	<Chains>

-		<!--

-			The input chain defines filters that are applied before command

-			execution

-		-->

-		<Chain Id="InputChain">

-			<Rules>

-				<!-- there is no command implemented that requires input filtering -->

-				<Rule Id="InputChain-AllowAll">

-					<Action>

-						<RuleAction>allow</RuleAction>

-					</Action>

-					<UserInteraction>confirm</UserInteraction>

-				</Rule>

-			</Rules>

-		</Chain>

-

-		<!--

-			The output chain defines filters that are applied after command

-			execution

-		-->

-		<Chain Id="OutputChain">

-			<Rules>

-				<Rule Id="OutputChain-Egov">

-					<AuthClass>certifiedGovAgency</AuthClass>

-					<Action>

-						<RuleAction>allow</RuleAction>

-					</Action>

-					<UserInteraction>confirm</UserInteraction>

-				</Rule>

-				<Rule Id="OutputChain-Command">

-					<AuthClass>anonymous</AuthClass>

-					<Action>

-						<ChainRef>Command</ChainRef>

-					</Action>

-				</Rule>

-			</Rules>

-		</Chain>

-		<Chain Id="Command">

-			<Rules>

-				<Rule Id="cmd-rule-1">

-					<AuthClass>certified</AuthClass>

-					<Command Name="Infobox.*">

-						<Param Name="InfoboxIdentifier">IdentityLink</Param>

-						<Param Name="PersonIdentifier">derived</Param>

-					</Command>

-					<Action>

-						<RuleAction>allow</RuleAction>

-					</Action>

-					<UserInteraction>confirm</UserInteraction>

-				</Rule>

-				<Rule Id="cmd-rule-2">

-					<AuthClass>anonymous</AuthClass>

-					<Command Name="Infobox.*">

-						<Param Name="InfoboxIdentifier">IdentityLink</Param>

-					</Command>

-					<Action>

-						<RuleAction>deny</RuleAction>

-					</Action>

-					<UserInteraction>info</UserInteraction>

-				</Rule>

-				<Rule Id="cmd-rule-3">

-					<Action>

-						<RuleAction>allow</RuleAction>

-					</Action>

-				</Rule>

-			</Rules>

-		</Chain>

-	</Chains>

-</AccessControl>

diff --git a/mocca-1.2.11/BKUOnline/src/main/resources/at/gv/egiz/bku/online/conf/defaultConf.properties b/mocca-1.2.11/BKUOnline/src/main/resources/at/gv/egiz/bku/online/conf/defaultConf.properties
deleted file mode 100644
index b4ecfd86..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/resources/at/gv/egiz/bku/online/conf/defaultConf.properties
+++ /dev/null
@@ -1,56 +0,0 @@
-#

-# Copyright 2008 Federal Chancellery Austria and

-# Graz University of Technology

-#

-# Licensed under the Apache License, Version 2.0 (the "License");

-# you may not use this file except in compliance with the License.

-# You may obtain a copy of the License at

-#

-#     http://www.apache.org/licenses/LICENSE-2.0

-#

-# Unless required by applicable law or agreed to in writing, software

-# distributed under the License is distributed on an "AS IS" BASIS,

-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-# See the License for the specific language governing permissions and

-# limitations under the License.

-#

-

-

-# Configuration for online CCE

-

-# security manager configuration

-AccessController.acceptUnmatched=false

-AccessController.policyResource=classpath:at/gv/egiz/bku/online/conf/accessControlConfig.xml

-

-# ------------BEGIN SSL Config --------------------

-# SSL configuration for connections to external

-# resources (e.g. data urls)

-

-# directory where certificates for 

-# chain constructions can be placed

-#SSL.certDirectory=classpath:at/gv/egiz/bku/online/conf/certs/certStore

-SSL.certDirectory=classpath:at/gv/egiz/bku/certs/certStore

-

-

-# Directory where trusted CA 

-# certificates are placed

-SSL.caDirectory=classpath:at/gv/egiz/bku/certs/trustStore

-SSL.sslProtocol=TLS

-

-# warning do not set the following property to true

-# its intended for debugging and testing only 

-SSL.disableAllChecks=false

-#SSL.disableHostnameVerification=true

-

-# ------------ END SSL Config  --------------------

-

-#UserAgent=citizen-card-environment/1.2 MOCCA/1.2

-#UserAgent=citizen-card-environment/1.2 trustDeskbasic/2.8.1

-

-ValidateHashDataInputs=true

-AppletTimeout=300000

-

-#HTTPProxyHost=taranis.iaik.tugraz.at

-#HTTPProxyPort=8888

-DefaultSocketTimeout=200

-#SignatureLayout=
\ No newline at end of file
diff --git a/mocca-1.2.11/BKUOnline/src/main/resources/commons-logging.properties b/mocca-1.2.11/BKUOnline/src/main/resources/commons-logging.properties
deleted file mode 100644
index 0d497b1b..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/resources/commons-logging.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2008 Federal Chancellery Austria and
-# Graz University of Technology
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger
diff --git a/mocca-1.2.11/BKUOnline/src/main/resources/log4j.properties b/mocca-1.2.11/BKUOnline/src/main/resources/log4j.properties
deleted file mode 100644
index d4a03fe7..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2008 Federal Chancellery Austria and
-# Graz University of Technology
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-#log4j.rootLogger=DEBUG, STDOUT, file
-log4j.rootLogger=INFO, file
-#log4j.logger.at.gv=TRACE
-
-
-# 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} | %20c |  %10t | %m%n
-#log4j.appender.STDOUT.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
-log4j.appender.STDOUT.layout.ConversionPattern=%-5p | %t | %c %x - %m%n
-
-# FILE appender
-log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.maxFileSize=500KB
-log4j.appender.file.maxBackupIndex=9
-log4j.appender.file.File=${catalina.base}/logs/bkuonline.log
-log4j.appender.file.threshold=trace
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p | %t | %c{1}:%L - %m%n
\ No newline at end of file
diff --git a/mocca-1.2.11/BKUOnline/src/main/webapp/META-INF/MANIFEST.MF b/mocca-1.2.11/BKUOnline/src/main/webapp/META-INF/MANIFEST.MF
deleted file mode 100644
index ae3f7b68..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/webapp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Archiver-Version: Plexus Archiver
-Created-By: Apache Maven
-Built-By: clemens
-Build-Jdk: 1.6.0_10
-Implementation-Build: 1.1.1-SNAPSHOT-r1
diff --git a/mocca-1.2.11/BKUOnline/src/main/webapp/META-INF/context.xml b/mocca-1.2.11/BKUOnline/src/main/webapp/META-INF/context.xml
deleted file mode 100644
index f38215a1..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/webapp/META-INF/context.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2008 Federal Chancellery Austria and
-  Graz University of Technology
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!--Context path="/bkuonline"/-->
-<Context path=""/>
diff --git a/mocca-1.2.11/BKUOnline/src/main/webapp/PINManagement.jsp b/mocca-1.2.11/BKUOnline/src/main/webapp/PINManagement.jsp
deleted file mode 100644
index e48b8405..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/webapp/PINManagement.jsp
+++ /dev/null
@@ -1,111 +0,0 @@
-<!--
-  Copyright 2008 Federal Chancellery Austria and
-  Graz University of Technology
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-         pageEncoding="UTF-8"
-         import="at.gv.egiz.org.apache.tomcat.util.http.AcceptLanguage"%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>MOCCA PIN Management</title>
-        <link rel="shortcut icon" href="img/chip16.ico" type="image/x-icon">
-        <script type="text/javascript" src="js/deployJava.js"></script>
-        <style type="text/css" media="all">@import "css/applet.css";</style>
-
-        <META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE">
-        <META HTTP-EQUIV="EXPIRES" CONTENT="Mon, 22 Jul 2002 11:12:01 GMT">
-        <META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE">
-    </head>
-    <%
-        String locale = request.getParameter("locale");
-        if (locale == null) {
-            String acceptLanguage = request.getHeader("Accept-Language");
-            locale = AcceptLanguage.getLocale(acceptLanguage).toString();
-        }
-        String widthP = request.getParameter("appletWidth");
-        String heightP = request.getParameter("appletHeight");
-        int width = (widthP == null) ? 295
-                : Integer.parseInt(widthP);
-        int height = (heightP == null) ? 200
-                : Integer.parseInt(heightP);
-        String guiStyle = request.getParameter("appletGuiStyle");
-        if (guiStyle == null) {
-            guiStyle = "advanced";
-        }
-        String backgroundImg = request.getParameter("appletBackground");
-    %>
-    <body id="appletpage" style="width:<%=width%>" onFocus="focusToApplet()">
-            <script>
-            
-            	// avoid selection of applet before it is completely loaded
-				var allowSelectionByJS = false;            
-            
-                if (!deployJava.versionCheck('1.6.0_04+')) {
-                    document
-                    .write('<b>Diese Anwendung benötigt die Java Platform Version 1.6.0_04 oder höher.</b>' + '<input type="submit" value="Java Platform 1.6.0_02 installieren" onclick="deployJava.installLatestJRE();">');
-                } else {
-                    var attributes = {
-                        codebase :'applet',
-                        code : 'at.gv.egiz.bku.online.applet.PINManagementApplet.class',
-                        archive : 'BKUAppletExt.jar, commons-logging.jar, iaik_jce_me4se.jar',
-                        width : <%=width%>,
-                        height :<%=height%>,
-                        name : 'moccaapplet',
-                        id : 'moccaapplet'
-                    };
-                    var parameters = {
-                        GuiStyle : '<%=guiStyle%>',
-                        Locale : '<%=locale%>',
-                        Background : '<%=backgroundImg%>',
-                        HelpURL : '../help/',
-                        SessionID : '<%=request.getSession().getId()%>',
-                        RedirectURL : '../',
-                        RedirectTarget: '_parent',
-                        EnforceRecommendedPINLength: 'true'
-                    };
-                    var version = '1.6.0_04';
-                    deployJava.runApplet(attributes, parameters, version);
-                }
-            </script>
-    </body>
-    
-    <script>
-
-		function focusToApplet() {
-	
-			//alert('try to set focus to applet');
-			if (document != null && document.moccaapplet != null && allowSelectionByJS) {
-	
-				//alert('set focus to applet.');
-				document.moccaapplet.getFocusFromBrowser();						
-				return true;					
-			}
-			allowSelectionByJS = true;
-		}
-	
-		function focusToBrowser() {
-
-			// put focus to window
-			// focus can be assigned to an arbitrary focusable field on the embedding website as well
-			self.focus();
-	
-		}		
-    
-    </script>
-    
-</html>
diff --git a/mocca-1.2.11/BKUOnline/src/main/webapp/SLRequestForm.html b/mocca-1.2.11/BKUOnline/src/main/webapp/SLRequestForm.html
deleted file mode 100644
index 2de652a7..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/webapp/SLRequestForm.html
+++ /dev/null
@@ -1,215 +0,0 @@
-<!--
-  Copyright 2008 Federal Chancellery Austria and
-  Graz University of Technology
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-    <head>
-        <title>Security-Layer v1.2 Request Formular</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-        <link rel="shortcut icon" href="img/chip16.ico" type="image/x-icon">
-        <script language="JavaScript" type="text/javascript">
-            <!--
-            function setAppletDimension(width, height)
-            {
-                document.forms.slform.appletWidth.value=width;
-                document.forms.slform.appletHeight.value=height;
-            }
-            function setNOPRequest() {
-                document.forms.slform.XMLRequest.value='<?xml version="1.0" encoding="UTF-8"?><NullOperationRequest xmlns="http://www.buergerkarte.at/namespaces/securitylayer/1.2#"/>';
-            }
-            
-            //-->
-        </script>
-        <style type="text/css" media="all">@import "css/main.css";</style>
-        <style type="text/css">
-            fieldset {
-                padding: 1em;
-                margin: 1em;
-                font: 80%/ 1 sans-serif;
-                background-color: #F2EFE9;
-                padding-left: 5em;
-            }
-
-            fieldset.submit {
-                float: none;
-                width: auto;
-                border: 0 none #FFF;
-                padding-left: 14em;
-                border-style: none;
-                background-color: transparent;
-            }
-
-            label {
-                float: left;
-                width: 8em;
-                margin-right: 0.5em;
-                padding-top: 0.2em;
-                text-align: right;
-                font-weight: bold;
-                color: #000;
-                padding-top: 0.2em;
-            }
-
-            legend {
-                border: 1px solid;
-                padding: 2px 6px
-            }
-        </style>
-
-    </head>
-    <body>
-        <h1>Security-Layer v1.2 Request Formular</h1>
-        <p>
-        <form action="./http-security-layer-request" method="Post"
-              enctype="application/x-www-form-urlencoded" name="slform">
-            <!--input name="locale" value="es_MX" type="hidden" /-->
-            <fieldset><legend>Enter XML Request</legend>
-                <p><label for="XMLRequest">XML Request</label> <textarea
-                        name="XMLRequest" rows=15 cols="60" id="XMLRequest">
-<?xml version="1.0" encoding="UTF-8"?>
-<sl:CreateXMLSignatureRequest 
-   xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#">
-<sl:KeyboxIdentifier>SecureSignatureKeypair</sl:KeyboxIdentifier>
-   <sl:DataObjectInfo Structure="detached">
-     <sl:DataObject Reference="test.txt">
-       <sl:XMLContent>Ich bin ein einfacher Text.</sl:XMLContent>
-     </sl:DataObject>
-    <sl:TransformsInfo>
-      <sl:FinalDataMetaInfo>
-       <sl:MimeType>text/plain</sl:MimeType>
-       </sl:FinalDataMetaInfo>
-    </sl:TransformsInfo>
-  </sl:DataObjectInfo>
-</sl:CreateXMLSignatureRequest> 
-                </textarea></p>
-                <!--
-<?xml version="1.0" encoding="UTF-8" ?>
-<sl:InfoboxReadRequest
-    xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#">
-    <sl:InfoboxIdentifier>IdentityLink</sl:InfoboxIdentifier>
-    <sl:BinaryFileParameters ContentIsXMLEntity="true" />
-</sl:InfoboxReadRequest>
--->
-<!--
-<?xml version="1.0" encoding="UTF-8"?>
-<sl:CreateXMLSignatureRequest
-   xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#">
-  <sl:KeyboxIdentifier>SecureSignatureKeypair</sl:KeyboxIdentifier>
-   <sl:DataObjectInfo Structure="enveloping">
-     <sl:DataObject>
-       <sl:XMLContent>Ich bin ein einfacher Text. llöäü߀</sl:XMLContent>
-     </sl:DataObject>
-    <sl:TransformsInfo>
-      <sl:FinalDataMetaInfo>
-       <sl:MimeType>text/plain</sl:MimeType>
-       </sl:FinalDataMetaInfo>
-    </sl:TransformsInfo>
-  </sl:DataObjectInfo>
-  <sl:DataObjectInfo Structure="enveloping">
-     <sl:DataObject>
-       <sl:XMLContent>
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>TestXHTML</title>
-    <style type="text/css" media="screen">
-      .heading { font-size: large; font-weight: bold; }
-      .content1 { }
-      .content2 { font-style: italic; }
-      .content3 { font-family: serif; }
-      .footer { font-size: small; }
-    </style>
-  </head>
-  <body>
-    <h3 class="heading">Heading3 large bold llöäü߀</h3>
-    <p class="content1">Ich bin ein einfacher Text. llöäü߀</p>
-    <p class="content2">Ich bin ein einfacher Text. llöäü߀</p>
-    <p class="content3">Ich bin ein einfacher Text. llöäü߀</p>
-    <p class="footer">Ich bin ein einfacher Text. llöäü߀</p>
-  </body>
-</html>
-        </sl:XMLContent>
-     </sl:DataObject>
-    <sl:TransformsInfo>
-      <sl:FinalDataMetaInfo>
-       <sl:MimeType>application/xhtml+xml</sl:MimeType>
-       </sl:FinalDataMetaInfo>
-    </sl:TransformsInfo>
-  </sl:DataObjectInfo>
-</sl:CreateXMLSignatureRequest>
--->
-<!--
-<?xml version='1.0' encoding='UTF-8'?>
-<sl10:InfoboxUpdateRequest xmlns:sl10='http://www.buergerkarte.at/namespaces/securitylayer/1.2#'>
-    <sl10:InfoboxIdentifier>CardChannel</sl10:InfoboxIdentifier>
-    <sl10:BinaryFileParameters>
-        <sl10:XMLContent>
-            <Script>
-                <Reset cold='true' />
-                <CommandAPDU sequence='1' of='2' expectedSW='9000'>00A4000C023F00</CommandAPDU>
-                <CommandAPDU sequence='2' of='2' expectedSW='9000'>00B0820000</CommandAPDU>
-            </Script>
-        </sl10:XMLContent>
-    </sl10:BinaryFileParameters>
-</sl10:InfoboxUpdateRequest>
--->
-            </fieldset>
-            <fieldset><legend>Request Parameters</legend>
-                <p>
-                    <label for="appletGuiStyle">GUI Style</label>
-                    <input type="radio" name="appletGuiStyle" value="tiny" onclick="setAppletDimension(152, 145)">tiny
-                    <input type="radio" name="appletGuiStyle" value="simple" checked="checked" onclick="setAppletDimension(190,130)">simple
-                    <input type="radio" name="appletGuiStyle" value="advanced" onclick="setAppletDimension(300, 180)">advanced
-                </p>
-                
-                <p><label for="appletWidth">Applet Width</label> <input
-                    name="appletWidth" value="190" id="appletWidth">
-                <p><label for="appletHeight">Applet Height</label> <input
-                    name="appletHeight" value="130" id="appletHeight">
-                <p><label for="appletBackground">Applet Background</label> <input
-                    name="appletBackground" value="" id="appletBackground">
-                <p><label for="appletBackgroundColor">Applet Background Color</label> <input
-                    name="appletBackgroundColor" value="" id="appletBackgroundColor">
-                </p>
-
-                <p>
-                    <label for="appletPage">Applet Page</label>
-                    <input type="radio" name="appletPage" value="BKUApplet" checked="checked">Default
-                    <input type="radio" name="appletPage" value="BKUAppletAlternative">Alternative
-                </p>
-<!--
-                <p>
-                    <label for="appletExtension">Extension</label>
-                    <input type="radio" name="appletExtension" value="activation" onclick="setInfoboxUpdateRequest()">Activation
-                    <input type="radio" name="appletExtension" value="pin" onclick="setAppletDimension(400, 200)">PIN Management
-                </p>
--->
-
-<!--
-                <p><label for="RedirectURL">RedirectURL</label> <input
-                    name="RedirectURL" value="" id="RedirectURL"></p>
-                <p><label for="DataURL">DataURL</label> <input name="DataURL"
-                    value="" id="DataURL"></p>
-                <p><label for="StylesheetURL">StylesheetURL</label> <input
-                    name="StylesheetURL" value="" id="StylesheetURL"></p>
-                <p>
--->
-                
-            </fieldset>
-            <fieldset class="submit"><input type="submit" class="submit"/></fieldset>
-        </form>
-
-    </body>
-</html>
diff --git a/mocca-1.2.11/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml b/mocca-1.2.11/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml
deleted file mode 100644
index fb3cae63..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-	<!--

-		Copyright 2008 Federal Chancellery Austria and Graz University of

-		Technology Licensed under the Apache License, Version 2.0 (the

-		"License"); you may not use this file except in compliance with the

-		License. You may obtain a copy of the License at

-		http://www.apache.org/licenses/LICENSE-2.0 Unless required by

-		applicable law or agreed to in writing, software distributed under the

-		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR

-		CONDITIONS OF ANY KIND, either express or implied. See the License for

-		the specific language governing permissions and limitations under the

-		License.

-	-->

-<beans xmlns="http://www.springframework.org/schema/beans"

-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"

-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">

-

-	<bean id="STALFactory" class="at.gv.egiz.stal.service.impl.RequestBrokerSTALFactory"

-		scope="singleton" />

-

-	<bean id="accessController"

-		class="at.gv.egiz.bku.online.accesscontroller.SpringSecurityManager"

-		scope="singleton" init-method="init">

-		<property name="config" ref="configurator" />

-	</bean>

-

-	<bean id="commandInvoker" class="at.gv.egiz.bku.binding.SLCommandInvokerImpl">

-		<property name="securityManager" ref="accessController" />

-	</bean>

-

-	<bean id="slCommandFactory" class="at.gv.egiz.bku.slcommands.SLCommandFactory"

-		factory-method="getInstance">

-		<property name="concreteFactories">

-		  <map>

-        <entry key-ref="nullOperationRequest" value-ref="nullOperationCommandFactory"/>

-		    <entry key-ref="infoboxReadRequest" value-ref="infoboxReadCommandFactory"/>

-        <entry key-ref="infoboxUpdateRequest" value-ref="infoboxUpdateCommandFactory"/>

-        <entry key-ref="createXMLSignatureRequest" value-ref="createXMLSignatureCommandFactory"/>

-        <entry key-ref="getStatusRequest" value-ref="getStatusCommandFactory"/>

-		  </map>

-		</property>

-	</bean>

-

-  <bean id="nullOperationCommandFactory" class="at.gv.egiz.bku.slcommands.impl.NullOperationCommandFactory"/>

-  <bean id="nullOperationRequest" class="javax.xml.namespace.QName">

-    <constructor-arg value="http://www.buergerkarte.at/namespaces/securitylayer/1.2#"/>

-    <constructor-arg value="NullOperationRequest"/>

-  </bean>

-  <bean id="infoboxReadCommandFactory" class="at.gv.egiz.bku.slcommands.impl.InfoboxReadCommandFactory">

-    <property name="infoboxFactory" ref="infoboxFactory"/>

-  </bean>

-  <bean id="infoboxReadRequest" class="javax.xml.namespace.QName">

-    <constructor-arg value="http://www.buergerkarte.at/namespaces/securitylayer/1.2#"/>

-    <constructor-arg value="InfoboxReadRequest"/>

-  </bean>

-  <bean id="infoboxUpdateCommandFactory" class="at.gv.egiz.bku.slcommands.impl.InfoboxUpdateCommandFactory">

-    <property name="infoboxFactory" ref="infoboxFactory"/>

-  </bean>

-  <bean id="infoboxUpdateRequest" class="javax.xml.namespace.QName">

-    <constructor-arg value="http://www.buergerkarte.at/namespaces/securitylayer/1.2#"/>

-    <constructor-arg value="InfoboxUpdateRequest"/>

-  </bean>

-  <bean id="createXMLSignatureCommandFactory" class="at.gv.egiz.bku.slcommands.impl.CreateXMLSignatureCommandFactory"/>

-  <bean id="createXMLSignatureRequest" class="javax.xml.namespace.QName">

-    <constructor-arg value="http://www.buergerkarte.at/namespaces/securitylayer/1.2#"/>

-    <constructor-arg value="CreateXMLSignatureRequest"/>

-  </bean>

-  <bean id="getStatusCommandFactory" class="at.gv.egiz.bku.slcommands.impl.GetStatusCommandFactory"/>

-  <bean id="getStatusRequest" class="javax.xml.namespace.QName">

-    <constructor-arg value="http://www.buergerkarte.at/namespaces/securitylayer/1.2#"/>

-    <constructor-arg value="GetStatusRequest"/>

-  </bean>

-

-  <bean id="infoboxFactory" class="at.gv.egiz.bku.slcommands.impl.InfoboxFactory">

-    <property name="infoboxFactories">

-      <map>

-        <entry key="Certificates" value-ref="certificatesInfoboxFactory"/>

-        <entry key="IdentityLink" value-ref="identityLinkInfoboxFactory"/>

-        <entry key="CardChannel" value-ref="cardChannelInfoboxFactory"/>

-        <entry key="SV-Personendaten" value-ref="svPersonendatenInfoboxFactory"/>

-      </map>

-    </property>

-  </bean>

-

-  <bean id="certificatesInfoboxFactory" class="at.gv.egiz.bku.slcommands.impl.CertificatesInfoboxFactory"/>

-  <bean id="identityLinkInfoboxFactory" class="at.gv.egiz.bku.slcommands.impl.IdentityLinkInfoboxFactory"/>

-  <bean id="cardChannelInfoboxFactory" class="at.gv.egiz.bku.slcommands.impl.CardChannelInfoboxFactory"/>

-  <bean id="svPersonendatenInfoboxFactory" class="at.gv.egiz.bku.slcommands.impl.SVPersonendatenInfoboxFactory"/>

-

-

-	<bean id="bindingProcessorManager" class="at.gv.egiz.bku.binding.BindingProcessorManagerImpl"

-		scope="singleton">

-		<constructor-arg ref="STALFactory"></constructor-arg>

-		<constructor-arg ref="commandInvoker"></constructor-arg>

-    <constructor-arg ref="configuration"></constructor-arg>

-	</bean>

-

-  <!-- TODO DataURL bean with configuration injected -->

-

-	<bean

-		class="org.springframework.web.context.support.ServletContextAttributeExporter">

-		<property name="attributes">

-			<map>

-				<entry key="bindingProcessorManager">

-					<ref bean="bindingProcessorManager" />

-				</entry>

-			</map>

-		</property>

-	</bean>

-

-	<!-- Configure Configuration -->

-	<bean id="certValidator" class="at.gv.egiz.bku.conf.CertValidatorImpl"></bean>

-

-

-	<bean id="configurator" class="at.gv.egiz.bku.online.conf.SpringConfigurator"

-		init-method="configure" scope="singleton">

-		<property name="resource"

-			value="classpath:at/gv/egiz/bku/online/conf/defaultConf.properties" />

-		<property name="certValidator" ref="certValidator"></property>

-	</bean>

-

-	<!-- Shutdown Event handler -->

-	<bean id="shutdown" class="at.gv.egiz.bku.online.webapp.ShutdownHandler">

-		<property name="bindingProcessorManager" ref="bindingProcessorManager"></property>

-	</bean>

-

-  <!-- Begin MOCCA Configuration [REFACTORED]

-   |   Configuration beans (no conf properties file) should be injected directly 

-   |   to module configurators (at.gv.egiz.bku.X.conf.Configuration).

-   |   Currently, only configuration items are considered.

-   |-->

-  <import resource="mocca-conf.xml"/>

-

-</beans>
\ No newline at end of file
diff --git a/mocca-1.2.11/BKUOnline/src/main/webapp/WEB-INF/mocca-conf.xml b/mocca-1.2.11/BKUOnline/src/main/webapp/WEB-INF/mocca-conf.xml
deleted file mode 100644
index 5c96dc58..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/webapp/WEB-INF/mocca-conf.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2008 Federal Chancellery Austria and
-  Graz University of Technology
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<!--
- |   User configuration file. (defaultConf.properties is migrated to this file)
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-                      http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
-
-  <!-- BKU Common (ie. main) Configuration -->
-  <bean id="configuration" class="at.gv.egiz.bku.conf.Configuration">
-    <property name="maxDataUrlHops" value="50"/>
-
-    <!-- TODO refactor DataURL and inject this bkuCommonConfig to DataURL -->
-    <!-- TODO inject bkuCommonConfig to SpringBKUServlet and SpringSecurityManager
-     |   and replace SpringConfigurator -->
-    <!-- used to construct the User-Agent HTTP header 
-    <property name="implementationName" value="MOCCA"/>
-    <property name="implementationVersion" value="1.0"/-->
-  </bean>
-
-  <!--
-   |   ReaderFactory configuration not available in Applet
-   |
-  <bean id="smccConfiguration" class="at.gv.egiz.smcc.conf.SMCCConfiguration">
-    <property name="disablePinpad" value="true"/>
-  </bean>
-
-  <bean id="readerFactory" class="at.gv.egiz.smcc.reader.ReaderFactory">
-    <property name="configuration" ref="smccConfiguration"/>
-  </bean>
-   |-->
-   
-</beans>
diff --git a/mocca-1.2.11/BKUOnline/src/main/webapp/WEB-INF/sun-jaxws.xml b/mocca-1.2.11/BKUOnline/src/main/webapp/WEB-INF/sun-jaxws.xml
deleted file mode 100644
index 02d632eb..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/webapp/WEB-INF/sun-jaxws.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2008 Federal Chancellery Austria and
-  Graz University of Technology
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<!--
-    Description: tomcat deployement 
--->
-
-<endpoints
-    xmlns="http://java.sun.com/xml/ns/jax-ws/ri/runtime"
-    version="2.0">
-
-    <endpoint
-        name="STALService"
-        interface="at.gv.egiz.stal.service.STALPortType"
-        implementation="at.gv.egiz.stal.service.impl.STALServiceImpl"
-        wsdl="WEB-INF/wsdl/stal.wsdl"
-        service="{http://www.egiz.gv.at/wsdl/stal}STALService"
-        port="{http://www.egiz.gv.at/wsdl/stal}STALPort"
-        url-pattern="/stal" />
-
-</endpoints>
diff --git a/mocca-1.2.11/BKUOnline/src/main/webapp/WEB-INF/web.xml b/mocca-1.2.11/BKUOnline/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 41cd400f..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-		Copyright 2008 Federal Chancellery Austria and Graz University of
-		Technology Licensed under the Apache License, Version 2.0 (the
-		"License"); you may not use this file except in compliance with the
-		License. You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-		applicable law or agreed to in writing, software distributed under the
-		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-		CONDITIONS OF ANY KIND, either express or implied. See the License for
-		the specific language governing permissions and limitations under the
-		License.
-	-->
-<web-app id="bkuonline" version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-  <display-name>http-security-layer-request</display-name>
-
-	<!--  Begin Spring Config -->
-  <context-param>
-    <param-name>contextConfigLocation</param-name>
-    <param-value>/WEB-INF/applicationContext.xml</param-value>
-  </context-param>
-  <listener>
-    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-  </listener>
-	<!--  End Spring Config -->
-
-	<!--  Begin BKU Config -->
-  <listener>
-    <listener-class>at.gv.egiz.bku.online.webapp.SessionTimeout</listener-class>
-  </listener>
-  <listener>
-    <listener-class>com.sun.xml.ws.transport.http.servlet.WSServletContextListener</listener-class>
-  </listener>
-  <servlet>
-    <servlet-name>BKUServlet</servlet-name>
-    <servlet-class>at.gv.egiz.bku.online.webapp.BKURequestHandler</servlet-class>
-  </servlet>
-  <servlet>
-    <servlet-name>ResultServlet</servlet-name>
-    <servlet-class>at.gv.egiz.bku.online.webapp.ResultServlet</servlet-class>
-    <init-param>
-      <param-name>responseEncoding</param-name>
-      <param-value>UTF-8</param-value>
-    </init-param>
-    <init-param>
-      <param-name>expiredPage</param-name>
-			<!-- FIXME -->
-      <param-value>expired.html</param-value>
-    </init-param>
-  </servlet>
-  <servlet>
-    <servlet-name>BKUApplet</servlet-name>
-    <jsp-file>/applet.jsp</jsp-file>
-  </servlet>
-    <servlet>
-        <servlet-name>STALService</servlet-name>
-        <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-        </servlet>
-    <servlet-mapping>
-    <servlet-name>BKUServlet</servlet-name>
-    <url-pattern>/http-security-layer-request</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>BKUServlet</servlet-name>
-    <url-pattern>/https-security-layer-request</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>ResultServlet</servlet-name>
-    <url-pattern>/bkuResult</url-pattern>
-  </servlet-mapping>
-
-    <!--
-     |  Configure alternative applet pages that may be requested
-     |  via the 'appletPage' form parameter (cf. SLRequestForm.html)
-    <servlet>
-        <servlet-name>BKUAppletAlternative</servlet-name>
-        <jsp-file>/appletAlternative.jsp</jsp-file>
-    </servlet-->
-
-    <!--
-     |  To disable applet caching load the applet via the AppletDispatcher
-     |  (cf. applet.jsp)
-    <servlet>
-        <servlet-name>AppletDispatcher</servlet-name>
-        <servlet-class>at.gv.egiz.bku.online.webapp.AppletDispatcher</servlet-class>
-    </servlet>
-    <servlet-mapping>
-      <servlet-name>AppletDispatcher</servlet-name>
-      <url-pattern>/applet/dispatch/*</url-pattern>
-    </servlet-mapping-->
-
-	<!--  End BKU Config -->
-
-  <!-- Begin BKU Web Start Config
-   |   (activate 'include-webstart' profile)
-  <servlet>
-    <servlet-name>JnlpDownloadServlet</servlet-name>
-    <servlet-class>jnlp.sample.servlet.JnlpDownloadServlet</servlet-class>
-    <init-param>
-      <param-name>logLevel</param-name>
-      <param-value>DEBUG</param-value>
-    </init-param>
-    <init-param>
-      <param-name>logPath</param-name>
-      <param-value>logs/jnlpdownloadservlet.log</param-value>
-    </init-param>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>JnlpDownloadServlet</servlet-name>
-    <url-pattern>/webstart/*</url-pattern>
-  </servlet-mapping>
-  -->
-  <!-- End BKU Web Start Config -->
-
-    <servlet-mapping>
-      <servlet-name>STALService</servlet-name>
-      <url-pattern>/stal</url-pattern>
-    </servlet-mapping>
-    <session-config>
-    <session-timeout>5</session-timeout>
-  </session-config>
-  <welcome-file-list>
-    <welcome-file>index.html</welcome-file>
-    <welcome-file>index.jsp</welcome-file>
-  </welcome-file-list>
-</web-app>
diff --git a/mocca-1.2.11/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.wsdl b/mocca-1.2.11/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.wsdl
deleted file mode 100644
index dc7ad8f1..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.wsdl
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2008 Federal Chancellery Austria and
-  Graz University of Technology
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<definitions name="stal" targetNamespace="http://www.egiz.gv.at/wsdl/stal"
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:tns="http://www.egiz.gv.at/wsdl/stal"
-    xmlns:stal="http://www.egiz.gv.at/stal"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-    <types>
-        <xsd:schema targetNamespace="http://www.egiz.gv.at/wsdl/stal">
-            <xsd:import namespace="http://www.egiz.gv.at/stal" schemaLocation="stal.xsd"/>
-            <!--xsd:import namespace="http://www.egiz.gv.at/stal" schemaLocation="stal-extended.xsd"/-->
-        </xsd:schema>
-        <!-- test 
-        <xsd:schema targetNamespace="http://www.egiz.gv.at/wsdl/stal-extended">
-            <xsd:import namespace="http://www.buergerkarte.at/cardchannel" schemaLocation="CardChannel.xsd"/>
-        </xsd:schema-->
-    </types>
-    <message name="ConnectRequest">
-        <part name="part1" element="stal:SessionId"/>
-    </message>
-    <message name="NextRequestRequest">
-        <part name="part1" element="stal:GetNextRequest"/>
-    </message>
-    <message name="NextRequestResponse">
-        <part name="part1" element="stal:GetNextRequestResponse"/>
-    </message>
-    <message name="GetHashDataInputRequest">
-        <part name="part1" element="stal:GetHashDataInput"/>
-    </message>
-    <message name="GetHashDataInputResponse">
-        <part name="part1" element="stal:GetHashDataInputResponse"/>
-    </message>
-    <message name="GetHashDataInputFault">
-        <part name="part1" element="stal:GetHashDataInputFault"/>
-    </message>
-    <portType name="STALPortType">
-        <operation name="connect">
-            <input name="input3" message="tns:ConnectRequest"/>
-            <output name="output3" message="tns:NextRequestResponse"/>
-        </operation>
-        <operation name="nextRequest">
-            <input name="input1" message="tns:NextRequestRequest"/>
-            <output name="output1" message="tns:NextRequestResponse"/>
-        </operation>
-        <operation name="getHashDataInput">
-            <input name="input2" message="tns:GetHashDataInputRequest"/>
-            <output name="output2" message="tns:GetHashDataInputResponse"/>
-            <fault name="fault1" message="tns:GetHashDataInputFault"/>
-        </operation>
-    </portType>
-    <binding name="STALBinding" type="tns:STALPortType">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <operation name="connect">
-            <input name="input3">
-              <soap:body use="literal"/>
-            </input>
-            <output name="output3">
-              <soap:body use="literal"/>
-            </output>
-        </operation>
-        <operation name="nextRequest">
-            <soap:operation/>
-            <input name="input1">
-                <soap:body use="literal"/>
-            </input>
-            <output name="output1">
-                <soap:body use="literal"/>
-            </output>
-        </operation>
-        <operation name="getHashDataInput">
-            <soap:operation/>
-            <input name="input2">
-                <soap:body use="literal"/>
-            </input>
-            <output name="output2">
-                <soap:body use="literal"/>
-            </output>
-            <fault name="fault1">
-                <soap:fault name="fault1"/>
-            </fault>
-        </operation>
-    </binding>
-    <service name="STALService">
-        <port name="STALPort" binding="tns:STALBinding">
-            <soap:address location="http://localhost:${HttpDefaultPort}/stal"/>
-        </port>
-    </service>
-</definitions>
diff --git a/mocca-1.2.11/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd b/mocca-1.2.11/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd
deleted file mode 100644
index a420035f..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2008 Federal Chancellery Austria and
-  Graz University of Technology
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.egiz.gv.at/stal"
-    xmlns:tns="http://www.egiz.gv.at/stal"
-    elementFormDefault="qualified">
-  <element name="SessionId" type="string"/>
-  <element name="GetNextRequest" type="tns:GetNextRequestType"/>
-  <element name="GetNextRequestResponse" type="tns:GetNextRequestResponseType"/>
-  <element name="GetHashDataInput" type="tns:GetHashDataInputType"/>
-  <element name="GetHashDataInputResponse" type="tns:GetHashDataInputResponseType"/>
-  <element name="GetHashDataInputFault" type="tns:GetHashDataInputFaultType"/>
-  <complexType name="GetNextRequestType">
-        <!-- abstract Request/Response type not supported by JAX-WS 2.0 (jdk < 1.6.0_04)  
-        <sequence>
-            <element name="Response" type="tns:ResponseType"  minOccurs="0"  maxOccurs="unbounded"/>
-        </sequence-->
-    <choice maxOccurs="unbounded">
-      <element name="InfoboxReadResponse" type="tns:InfoboxReadResponseType"/>
-      <element name="SignResponse" type="tns:SignResponseType"/>
-      <element name="ErrorResponse" type="tns:ErrorResponseType"/>
-      <element name="StatusResponse" type="tns:StatusResponseType"/>
-    </choice>
-    <attribute name="SessionId" type="string"/>
-  </complexType>
-  <complexType name="ResponseType" abstract="true" />
-  <complexType name="InfoboxReadResponseType">
-    <complexContent>
-      <extension base="tns:ResponseType">
-        <sequence>
-          <element name="InfoboxValue" type="base64Binary"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="SignResponseType">
-    <complexContent>
-      <extension base="tns:ResponseType">
-        <sequence>
-          <element name="SignatureValue" type="base64Binary"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="ErrorResponseType">
-    <complexContent>
-      <extension base="tns:ResponseType">
-        <sequence>
-          <element name="ErrorCode" type="int"/>
-          <element name="ErrorMessage" type="string"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="StatusResponseType">
-    <complexContent>
-      <extension base="tns:ResponseType">
-        <attribute name="cardReady" type="boolean" />
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="GetNextRequestResponseType">
-        <!-- abstract Request/Response type not supported by JAX-WS 2.0 (jdk < 1.6.0_04) 
-        <sequence>
-            <element name="Request" type="tns:RequestType" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence-->
-    <choice maxOccurs="unbounded">
-      <element name="InfoboxReadRequest" type="tns:InfoboxReadRequestType"/>
-      <element name="SignRequest" type="tns:SignRequestType"/>
-      <element name="QuitRequest" type="tns:QuitRequestType"/>
-      <element name="StatusRequest" type="tns:StatusRequestType"/>
-    </choice>
-    <attribute name="SessionId" type="string"/>
-  </complexType>
-  <complexType name="RequestType" abstract="true"/>
-  <complexType name="InfoboxReadRequestType">
-    <complexContent>
-      <extension base="tns:RequestType">
-        <sequence>
-          <element name="InfoboxIdentifier">
-            <simpleType>
-              <restriction base="string">
-                <enumeration value="Certificates"/>
-                <enumeration value="IdentityLink"/>
-                <enumeration value="Mandates"/>
-              </restriction>
-            </simpleType>
-          </element>
-          <element name="DomainIdentifier" type="anyURI" minOccurs="0"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="SignRequestType">
-    <complexContent>
-      <extension base="tns:RequestType">
-        <sequence>
-          <element name="KeyIdentifier">
-            <simpleType>
-              <restriction base="string">
-                <enumeration value="SecureSignatureKeypair"/>
-                <enumeration value="CertifiedKeypair"/>
-              </restriction>
-            </simpleType>
-          </element>
-          <element name="SignedInfo" type="base64Binary"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="QuitRequestType">
-    <complexContent>
-      <extension base="tns:RequestType"/>
-    </complexContent>
-  </complexType>
-  <complexType name="StatusRequestType">
-    <complexContent>
-      <extension base="tns:RequestType"/>
-    </complexContent>
-  </complexType>
-  <complexType name="GetHashDataInputType">
-    <sequence>
-      <element name="Reference" maxOccurs="unbounded">
-        <complexType>
-          <attribute name="ID" type="string"/>
-        </complexType>
-      </element>
-    </sequence>
-    <attribute name="SessionId" type="string"/>
-  </complexType>
-  <complexType name="GetHashDataInputResponseType">
-    <sequence>
-      <element name="Reference" maxOccurs="unbounded">
-        <complexType>
-          <simpleContent>
-            <extension base="base64Binary">
-              <attribute name="ID" type="string"/>
-              <attribute name="MimeType" type="string" use="optional"/>
-              <attribute name="Encoding" type="string" use="optional"/>
-              <attribute name="Filename" type="string" use="optional"/>
-            </extension>
-          </simpleContent>
-        </complexType>
-      </element>
-    </sequence>
-    <attribute name="SessionId" type="string"/>
-  </complexType>
-  <complexType name="GetHashDataInputFaultType">
-    <sequence>
-      <element name="ErrorCode" type="int"/>
-      <element name="ErrorMessage" type="string"/>
-    </sequence>
-  </complexType>
-</schema>
diff --git a/mocca-1.2.11/BKUOnline/src/main/webapp/applet.jsp b/mocca-1.2.11/BKUOnline/src/main/webapp/applet.jsp
deleted file mode 100644
index 582bee7e..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/webapp/applet.jsp
+++ /dev/null
@@ -1,111 +0,0 @@
-<!--
-  Copyright 2008 Federal Chancellery Austria and
-  Graz University of Technology
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-  pageEncoding="UTF-8" 
-  import="at.gv.egiz.bku.online.webapp.AppletDispatcher, org.apache.commons.lang.RandomStringUtils, org.apache.commons.lang.StringEscapeUtils" %>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>MOCCA Applet</title>
-        <link rel="shortcut icon" href="img/chip16.ico" type="image/x-icon">
-        <script type="text/javascript" src="js/deployJava.js"></script>
-        <style type="text/css" media="all">@import "css/applet.css";</style>
-
-        <META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE">
-        <META HTTP-EQUIV="EXPIRES" CONTENT="Mon, 22 Jul 2002 11:12:01 GMT">
-        <META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE">
-    </head>
-    <%
-        String locale = StringEscapeUtils.escapeJavaScript(
-            (String) session.getAttribute("locale"));
-
-        int width = session.getAttribute("appletWidth") == null ? 190
-                : (Integer) session.getAttribute("appletWidth"); 
-        int height = session.getAttribute("appletHeight") == null ? 130
-                : (Integer) session.getAttribute("appletHeight");
-        String backgroundImg = StringEscapeUtils.escapeJavaScript(
-            session.getAttribute("appletBackground") == null 
-                ? "../img/chip32.png"
-                : (String) session.getAttribute("appletBackground"));
-        String backgroundColor = StringEscapeUtils.escapeJavaScript(
-            (String) session.getAttribute("appletBackgroundColor"));
-        String guiStyle = StringEscapeUtils.escapeJavaScript(
-            (String) session.getAttribute("appletGuiStyle"));
-        
-        String sessionId = StringEscapeUtils.escapeJavaScript(session.getId());
-        
-        String extension = (String) session.getAttribute("appletExtension");
-        String appletClass, appletArchive;
-        if ("activation".equalsIgnoreCase(extension)) {
-            appletArchive = "BKUAppletExt";
-            appletClass = "at.gv.egiz.bku.online.applet.ActivationApplet.class";
-        } else if ("pin".equalsIgnoreCase(extension)) {
-            appletArchive = "BKUAppletExt";
-            appletClass = "at.gv.egiz.bku.online.applet.PINManagementApplet.class";
-        } else {
-            appletArchive = "BKUApplet";
-            appletClass = "at.gv.egiz.bku.online.applet.BKUApplet.class";
-        }
-     
-        // disable applet caching
-        boolean disableAppletCaching = false;
-        String codebase = "applet";
-        
-        if (disableAppletCaching)  {
-          // run in AppletDispatcher context and
-          // append random alphanumeric string to avoid applet caching
-          // TODO prepend ../ to all xxxURL applet paramaters 
-          codebase += "/" + AppletDispatcher.DISPATCH_CTX;
-          String rand = AppletDispatcher.RAND_PREFIX +
-                  RandomStringUtils.randomAlphanumeric(16);
-          appletArchive += rand;
-        }
-
-    %>
-    <body id="appletpage" style="width:<%=width%>px">
-      <script type="text/javascript">
-        if (!deployJava.versionCheck('1.6.0_04+')) {
-          document.write('<p>Diese Anwendung benötigt Version 6 Update 4 oder höher der <a href="" onclick="deployJava.installLatestJRE();">Java&trade; Laufzeitumgebung</a>.</p>');
-        } else {
-          var attributes = {
-            codebase :'<%=codebase%>',
-            code : '<%=appletClass%>',
-            archive : '<%=appletArchive +".jar, commons-logging.jar, iaik_jce_me4se.jar"%>',
-            width : <%=width%>,
-            height :<%=height%>,
-            name : 'moccaapplet',
-            id : 'moccaapplet'
-          };
-          var parameters = {
-            GuiStyle : '<%=guiStyle%>',
-            Locale : '<%=locale%>',
-            Background : '<%=backgroundImg%>',
-            BackgroundColor : '<%=backgroundColor%>',
-            WSDL_URL : '../stal;jsessionid=<%=sessionId%>?wsdl',
-            HelpURL : '../help/',
-            SessionID : '<%=sessionId%>',
-            RedirectURL : '../bkuResult',
-            RedirectTarget: '_parent',
-            EnforceRecommendedPINLength: 'true'
-          };
-          deployJava.runApplet(attributes, parameters, '1.6.0_04');
-        }
-      </script>
-    </body>
-</html>
diff --git a/mocca-1.2.11/BKUOnline/src/main/webapp/css/applet.css b/mocca-1.2.11/BKUOnline/src/main/webapp/css/applet.css
deleted file mode 100644
index d2c734a1..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/webapp/css/applet.css
+++ /dev/null
@@ -1,15 +0,0 @@
-root { 
-    display: block;
-}
-
-body {
-    background: #ffffff;
-    /*background-image: url(../img/mocca-t_s.png);*/
-    padding: 0;
-    margin: 0;
-    border-style: none;
-    /*
-    width:<%=width%>
-    */
-}
-
diff --git a/mocca-1.2.11/BKUOnline/src/main/webapp/css/appletAlternative.css b/mocca-1.2.11/BKUOnline/src/main/webapp/css/appletAlternative.css
deleted file mode 100644
index ce11f1b2..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/webapp/css/appletAlternative.css
+++ /dev/null
@@ -1,12 +0,0 @@
-root { 
-    display: block;
-}
-
-body {
-    background: #ffffff;
-    background-image: url(../img/mocca-t_s.png);
-    padding: 0;
-    margin: 0;
-    border-style: none;
-}
-
diff --git a/mocca-1.2.11/BKUOnline/src/main/webapp/css/main.css b/mocca-1.2.11/BKUOnline/src/main/webapp/css/main.css
deleted file mode 100644
index b6d6e906..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/webapp/css/main.css
+++ /dev/null
@@ -1,55 +0,0 @@
-/* 
-Document   : main
-Created on : 27.02.2009, 10:24:41
-Author     : clemens
-Description:
-Purpose of the stylesheet follows.
-*/
-
-/* 
-TODO customize this sample style
-Syntax recommendation http://www.w3.org/TR/REC-CSS2/
-*/
-
-root { 
-    display: block;
-}
-
-body {
-    font-family: sans-serif;
-    font-size: 14px;
-}
-
-h1 {
-    font-size: 16px;
-}
-
-.disabled {
-  /* for IE */
-  filter:alpha(opacity=60);
-  /* CSS3 standard */
-  opacity:0.4;
-}
-
-.box {
-    margin-top: 10px;
-    color: #292929;
-    width: 250px;
-    border: 1px solid #BABABA;
-    background-color: #ddd;
-    padding-left: 10px;
-    padding-right: 10px;
-    margin-left: 10px;
-    margin-bottom: 1em;
-    -o-border-radius: 10px;
-    -moz-border-radius: 12px;
-    -webkit-border-radius: 10px;
-    -webkit-box-shadow: 0px 3px 7px #adadad;
-    border-radius: 10px;
-    -moz-box-sizing: border-box;
-    -opera-sizing: border-box;
-    -webkit-box-sizing: border-box;
-    -khtml-box-sizing: border-box;
-    box-sizing: border-box;
-    overflow: hidden;
-}
\ No newline at end of file
diff --git a/mocca-1.2.11/BKUOnline/src/main/webapp/errorresponse.css b/mocca-1.2.11/BKUOnline/src/main/webapp/errorresponse.css
deleted file mode 100644
index 41402e71..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/webapp/errorresponse.css
+++ /dev/null
@@ -1,12 +0,0 @@
-@CHARSET "UTF-8";
-sl\:ErrorResponse {margin: 0.5em; display: block;}
-sl\:ErrorCode {display: inline;}
-sl\:Info {display: inline;}
-
-ErrorResponse:lang(de):before {content: "Bei der Verarbeitung der Anfrage durch die Bürgerkartenumgebung ist ein Fehler aufgetreten: "; font-weight: bolder;}
-ErrorResponse:before {content: "An error has occoured upon request processing by the citizen card software: "; font-weight: bold;}
-ErrorResponse {margin: 0.5em; display: block;}
-ErrorCode:lang(de):before {content: "Fehler-Code: ";} 
-ErrorCode:before {content: "Error Code: ";} 
-ErrorCode {display: block;}
-Info {display: block;}
\ No newline at end of file
diff --git a/mocca-1.2.11/BKUOnline/src/main/webapp/expired.html b/mocca-1.2.11/BKUOnline/src/main/webapp/expired.html
deleted file mode 100644
index 2bb961f5..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/webapp/expired.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-  Copyright 2008 Federal Chancellery Austria and
-  Graz University of Technology
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Session Expired</title>
-</head>
-<body>
-    <p>
-    Ihre Sitzung ist abgelaufen. 
-    <!--Ein neuer BKU request kann im <a href="HTTP-ohne.html">Requestformular</a> erstellt werden.-->
-    </p>
-</body>
-</html>
\ No newline at end of file
diff --git a/mocca-1.2.11/BKUOnline/src/main/webapp/img/chip16.ico b/mocca-1.2.11/BKUOnline/src/main/webapp/img/chip16.ico
deleted file mode 100644
index 42175127..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/webapp/img/chip16.ico
+++ /dev/null
diff --git a/mocca-1.2.11/BKUOnline/src/main/webapp/img/chip32.png b/mocca-1.2.11/BKUOnline/src/main/webapp/img/chip32.png
deleted file mode 100644
index e7efb020..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/webapp/img/chip32.png
+++ /dev/null
diff --git a/mocca-1.2.11/BKUOnline/src/main/webapp/img/webstart.png b/mocca-1.2.11/BKUOnline/src/main/webapp/img/webstart.png
deleted file mode 100644
index 87d1cf7b..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/webapp/img/webstart.png
+++ /dev/null
diff --git a/mocca-1.2.11/BKUOnline/src/main/webapp/index.html b/mocca-1.2.11/BKUOnline/src/main/webapp/index.html
deleted file mode 100644
index b39dafb7..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/webapp/index.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--
-  Copyright 2008 Federal Chancellery Austria and
-  Graz University of Technology
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-    <head>
-        <title>MOCCA</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <link rel="shortcut icon" href="img/chip16.ico" type="image/x-icon">
-        <link href="css/main.css" rel="stylesheet" type="text/css" />
-        <script src="js/deployJava.js" type="text/javascript"></script>
-        <!--script src="http://java.com/js/deployJava.js" type="text/javascript"></script-->
-    </head>
-    <body>
-        <div id="animDiv" class="box">
-            <p>
-                <h1>MOCCA Online</h1>
-                <p>
-                <a href="SLRequestForm.html">Security Layer Request</a> (demo request form)
-                </p>
-                <p>
-                <a href="PINManagement.jsp">PIN Management</a> (pin management applet)
-                </p>
-                <p>
-                <a href="stal">STAL Service</a> (web service endpoint)
-                </p>
-            </p>
-        </div>
-
-        <!-- MOCCA Web Start
-         |   (activate 'include-webstart' profile)
-         -->
-        <div id="animDiv" class="box">
-          <p>
-              <h1>MOCCA Web Start</h1>
-              <p>
-                <script type="text/javascript">
-                  var url="webstart/mocca.jnlp"
-                  deployJava.createWebStartLaunchButton(url, "1.6")
-              </script></p>
-              <p><a href="webstart/mocca.jnlp">MOCCA JNLP File</a> (requires MIME-type association)</p>
-              <p><a href="webstart/player.jnlp">Java Cache Viewer</a> (local installation)</p>
-          </p>
-        </div>
-    </body>
-</html>
diff --git a/mocca-1.2.11/BKUOnline/src/main/webapp/js/deployJava.js b/mocca-1.2.11/BKUOnline/src/main/webapp/js/deployJava.js
deleted file mode 100644
index e25902c0..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/webapp/js/deployJava.js
+++ /dev/null
@@ -1,925 +0,0 @@
-/*
- * Copyright (c)  2008 Sun Microsystems, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- *   - Neither the name of Sun Microsystems nor the names of its
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Added by EGIZ:
- * This file contains workarounds to
- * [#423] Firefox 3.0.11 bug #498132 causes applet loading failure
- *   (lines 95-99)
- * [#424] Web Start loading via java plugin (Sun deployment script) fails on WinXP/Vista
- *   (lines 501-506)
- *
- * features:
- * [#425] Disable WebStart Launch Button for MacOS
- *   (lines 492-504)
- *
- */
-
-/*
- * deployJava.js
- *
- * This file is part of the Deployment Toolkit.  It provides functions for web
- * pages to detect the presence of a JRE, install the latest JRE, and easily run
- * applets or Web Start programs.  Usage guide may be found at http://<TBD>/.
- * 
- * The "live" copy of this file may be found at 
- * http://java.com/js/deployJava.js.  
- * You are encouraged to link directly to the live copy of the file.
- *
- * @version @(#)deployJava.js	1.13 08/10/28
- */
-
-var deployJava = {
-    debug: null,
-
-    myInterval: null,
-    preInstallJREList: null,
-    returnPage: null,
-    brand: null,
-    locale: null,
-    installType: null,
-    
-    EAInstallEnabled: false,
-    EarlyAccessURL: null,
-    
-    // GetJava page
-    getJavaURL: 'http://java.sun.com/webapps/getjava/BrowserRedirect?host=java.com',
-    
-    // Apple redirect page
-    appleRedirectPage: 'http://www.apple.com/support/downloads/',
-
-    // mime-type of the DeployToolkit plugin object
-    mimeType: 'application/npruntime-scriptable-plugin;DeploymentToolkit',
-
-    // location of the Java Web Start launch button graphic
-    launchButtonPNG: 'img/webstart.png',
-
-    /**
-     * Returns an array of currently-installed JRE version strings.  
-     * Version strings are of the form #.#[.#[_#]], with the function returning
-     * as much version information as it can determine, from just family 
-     * versions ("1.4.2", "1.5") through the full version ("1.5.0_06").
-     *
-     * Detection is done on a best-effort basis.  Under some circumstances 
-     * only the highest installed JRE version will be detected, and 
-     * JREs older than 1.4.2 will not always be detected.
-     */
-    getJREs: function() {
-        var list = new Array();
-        if (deployJava.isPluginInstalled()) {
-            var plugin =  deployJava.getPlugin();
-            //[#423] Firefox 3.0.11 bug #498132 causes applet loading failure
-            var jvms = plugin.jvms;
-            for (var i = 0; i < jvms.getLength(); i++) {
-                list[i] = jvms.get(i).version;
-            }
-        } else {
-            var browser = deployJava.getBrowser();
-
-            if (browser == 'MSIE') {
-                if (deployJava.testUsingActiveX('1.8.0')) {
-                    list[0] = '1.8.0';
-                } else if (deployJava.testUsingActiveX('1.7.0')) {
-                    list[0] = '1.7.0';
-                } else if (deployJava.testUsingActiveX('1.6.0')) {
-                    list[0] = '1.6.0';
-                } else if (deployJava.testUsingActiveX('1.5.0')) {
-                    list[0] = '1.5.0';
-                } else if (deployJava.testUsingActiveX('1.4.2')) {
-                    list[0] = '1.4.2';
-                } else if (deployJava.testForMSVM()) {
-                    list[0] = '1.1';
-                }
-            }
-            else if (browser == 'Netscape Family') {
-                if (deployJava.testUsingMimeTypes('1.8')) {
-                    list[0] = '1.8.0';
-                } else if (deployJava.testUsingMimeTypes('1.7')) {
-                    list[0] = '1.7.0';
-                } else if (deployJava.testUsingMimeTypes('1.6')) {
-                    list[0] = '1.6.0';
-                } else if (deployJava.testUsingMimeTypes('1.5')) {
-                    list[0] = '1.5.0';
-                } else if (deployJava.testUsingMimeTypes('1.4.2')) {
-                    list[0] = '1.4.2';
-                }
-            } else if (browser == 'Safari') {
-                if (deployJava.testUsingPluginsArray('1.8.0')) {
-                    list[0] = '1.8.0';
-                } else if (deployJava.testUsingPluginsArray('1.7.0')) {
-                    list[0] = '1.7.0';
-                } else if (deployJava.testUsingPluginsArray('1.6.0')) {
-                    list[0] = '1.6.0';
-                } else if (deployJava.testUsingPluginsArray('1.5.0')) {
-                    list[0] = '1.5.0';
-                } else if (deployJava.testUsingPluginsArray('1.4.2')) {
-                    list[0] = '1.4.2';
-                }
-            }
-        }
-
-        if (deployJava.debug) {
-            for (var i = 0; i < list.length; ++i) {
-                alert('We claim to have detected Java SE ' + list[i]);
-            }
-        }
-    
-        return list;
-    },
-    
-    /**
-     * Triggers a JRE installation.  The exact effect of triggering an 
-     * installation varies based on platform, browser, and if the 
-     * Deployment Toolkit plugin is installed.
-     *
-     * The requestVersion string is of the form #[.#[.#[_#]]][+|*], 
-     * which includes strings such as "1.4", "1.5.0*", and "1.6.0_02+".  
-     * A star (*) means "any version starting within this family" and 
-     * a plus (+) means "any version greater or equal to this".  
-     * "1.5.0*" * matches 1.5.0_06 but not 1.6.0_01, whereas 
-     * "1.5.0+" matches both.
-     *
-     * If the Deployment Toolkit plugin is not present, this will just call 
-     * deployJava.installLatestJRE(). 
-     */
-    installJRE: function(requestVersion) {
-        var ret = false;
-        if (deployJava.isPluginInstalled()) {
-            if (deployJava.getPlugin().installJRE(requestVersion)) {
-                deployJava.refresh();
-                if (deployJava.returnPage != null) {
-                    document.location = deployJava.returnPage;
-                }
-                return true;
-            } else {
-                return false;
-            }
-        } else {
-            return deployJava.installLatestJRE();
-        }
-    },
-
-
-    /**
-     * Triggers a JRE installation.  The exact effect of triggering an 
-     * installation varies based on platform, browser, and if the 
-     * Deployment Toolkit plugin is installed.
-     *
-     * In the simplest case, the browser window will be redirected to the 
-     * java.com JRE installation page, and (if possible) a redirect back to 
-     * the current URL upon successful installation.  The return redirect is 
-     * not always possible, as the JRE installation may require the browser to 
-     * be restarted.
-     *
-     * In the best case (when the Deployment Toolkit plugin is present), this
-     * function will immediately cause a progress dialog to be displayed 
-     * as the JRE is downloaded and installed.
-     */
-    installLatestJRE: function() {
-        if (deployJava.isPluginInstalled()) {
-            if (deployJava.getPlugin().installLatestJRE()) {
-                deployJava.refresh();
-                if (deployJava.returnPage != null) {
-                    document.location = deployJava.returnPage;
-                }
-                return true;
-            } else {
-                return false;
-            }
-        } else {
-            var browser = deployJava.getBrowser();
-            var platform = navigator.platform.toLowerCase();
-            if ((deployJava.EAInstallEnabled == 'true') && 
-                (platform.indexOf('win') != -1) && 
-                (deployJava.EarlyAccessURL != null)) {
-
-                deployJava.preInstallJREList = deployJava.getJREs();
-                if (deployJava.returnPage != null) {
-                    deployJava.myInterval = 
-                        setInterval("deployJava.poll()", 3000);
-                }
-
-                location.href = deployJava.EarlyAccessURL;
-
-                // we have to return false although there may be an install
-                // in progress now, when complete it may go to return page
-                return false;
-            } else {
-                if (browser == 'MSIE') {
-                    return deployJava.IEInstall();
-                } else if ((browser == 'Netscape Family') && 
-                           (platform.indexOf('win32') != -1)) {
-                    return deployJava.FFInstall();
-                } else {
-                    location.href = deployJava.getJavaURL + 
-                        ((deployJava.returnPage != null) ?
-                        ('&returnPage=' + deployJava.returnPage) : '') + 
-                        ((deployJava.locale != null) ?
-                        ('&locale=' + deployJava.locale) : '') +
-                        ((deployJava.brand != null) ? 
-                         ('&brand=' + deployJava.brand) : '');
-                }
-                // we have to return false although there may be an install
-                // in progress now, when complete it may go to return page
-                return false;
-            }
-        }
-    },
-
-
-    /**
-     * Ensures that an appropriate JRE is installed and then runs an applet.
-     * minimumVersion is of the form #[.#[.#[_#]]], and is the minimum 
-     * JRE version necessary to run this applet.  minimumVersion is optional, 
-     * defaulting to the value "1.1" (which matches any JRE).  
-     * If an equal or greater JRE is detected, runApplet() will call 
-     * writeAppletTag(attributes, parameters) to output the applet tag, 
-     * otherwise it will call installJRE(minimumVersion + '+').
-     *
-     * After installJRE() is called, the script will attempt to detect that the 
-     * JRE installation has completed and begin running the applet, but there
-     * are circumstances (such as when the JRE installation requires a browser
-     * restart) when this cannot be fulfilled.
-     *
-     * As with writeAppletTag(), this function should only be called prior to 
-     * the web page being completely rendered.  Note that version wildcards 
-     * (star (*) and plus (+)) are not supported, and including them in the 
-     * minimumVersion will result in an error message.
-     */
-    runApplet: function(attributes, parameters, minimumVersion) {
-        if (minimumVersion == 'undefined' || minimumVersion == null) {
-            minimumVersion = '1.1';
-        }
-
-        var regex = "^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+)(?:_(\\d+))?)?)?$";
-
-        var matchData = minimumVersion.match(regex);
-
-        if (deployJava.returnPage == null) {
-            // if there is an install, come back here and run the applet
-            deployJava.returnPage = document.location;
-        }
-
-        if (matchData != null) {
-            var browser = deployJava.getBrowser();
-            if ((browser != '?') && (browser != 'Safari')) {
-                if (deployJava.versionCheck(minimumVersion + '+')) {
-                    deployJava.writeAppletTag(attributes, parameters);
-                } else if (deployJava.installJRE(minimumVersion + '+')) {
-                    // after successfull install we need to refresh page to pick
-                    // pick up new plugin
-                    deployJava.refresh();
-                    location.href = document.location;
-                    deployJava.writeAppletTag(attributes, parameters);
-                }
-            } else {
-                // for unknown or Safari - just try to show applet
-                deployJava.writeAppletTag(attributes, parameters);
-            }
-        } else {
-            if (deployJava.debug) {
-                alert('Invalid minimumVersion argument to runApplet():' + 
-                      minimumVersion);
-            }
-        }
-    },
-
-    
-    /**
-     * Outputs an applet tag with the specified attributes and parameters, where
-     * both attributes and parameters are associative arrays.  Each key/value 
-     * pair in attributes becomes an attribute of the applet tag itself, while
-     * key/value pairs in parameters become <PARAM> tags.  No version checking 
-     * or other special behaviors are performed; the tag is simply written to 
-     * the page using document.writeln().
-     *
-     * As document.writeln() is generally only safe to use while the page is 
-     * being rendered, you should never call this function after the page 
-     * has been completed.
-     */
-    writeAppletTag: function(attributes, parameters) {
-        var s = '<' + 'applet ';
-        for (var attribute in attributes) {
-            s += (' ' + attribute + '="' + attributes[attribute] + '"');
-        }
-        s += '>';
-        document.write(s);
-    
-        if (parameters != 'undefined' && parameters != null) {
-            var codebaseParam = false;
-            for (var parameter in parameters) {
-                if (parameter == 'codebase_lookup') {
-                    codebaseParam = true;
-                }
-                s = '<param name="' + parameter + '" value="' + 
-                    parameters[parameter] + '">';
-                document.write(s);
-            }
-            if (!codebaseParam) {
-              document.write('<param name="codebase_lookup" value="false">');
-            }
-        }
-        document.write('<' + '/' + 'applet' + '>');
-    },
-    
-    
-     /**
-      * Returns true if there is a matching JRE version currently installed 
-      * (among those detected by getJREs()).  The versionPattern string is 
-      * of the form #[.#[.#[_#]]][+|*], which includes strings such as "1.4", 
-      * "1.5.0*", and "1.6.0_02+".  
-      * A star (*) means "any version within this family" and a plus (+) means 
-      * "any version greater or equal to the specified version".  "1.5.0*"
-      * matches 1.5.0_06 but not 1.6.0_01, whereas "1.5.0+" matches both.
-      *
-      * If the versionPattern does not include all four version components 
-      * but does not end with a star or plus, it will be treated as if it 
-      * ended with a star.  "1.5" is exactly equivalent to "1.5*", and will 
-      * match any version number beginning with "1.5".
-      *
-      * If getJREs() is unable to detect the precise version number, a match 
-      * could be ambiguous.  For example if getJREs() detects "1.5", there is 
-      * no way to know whether the JRE matches "1.5.0_06+".  versionCheck() 
-      * compares only as much of the version information as could be detected, 
-      * so versionCheck("1.5.0_06+") would return true in in this case.
-      *
-      * Invalid versionPattern will result in a JavaScript error alert.  
-      * versionPatterns which are valid but do not match any existing JRE 
-      * release (e.g. "32.65+") will always return false.
-      */
-    versionCheck: function(versionPattern)
-    {
-        var index = 0;
-        var regex = "^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+)(?:_(\\d+))?)?)?(\\*|\\+)?$";
-
-        var matchData = versionPattern.match(regex);
-
-        if (matchData != null) {
-            var familyMatch = true;
-
-            var patternArray = new Array();
-
-            for (var i = 1; i < matchData.length; ++i) {
-                // browser dependency here.
-                // Fx sets 'undefined', IE sets '' string for unmatched groups
-                if ((typeof matchData[i] == 'string') && (matchData[i] != '')) {
-                    patternArray[index] = matchData[i];
-                    index++;
-                }
-            }
-
-            if (patternArray[patternArray.length-1] == '+') {
-                familyMatch = false;
-                patternArray.length--;
-            } else {
-                if (patternArray[patternArray.length-1] == '*') {
-                    patternArray.length--;
-                }
-            }
-
-            var list = deployJava.getJREs();
-            for (var i = 0; i < list.length; ++i) {
-                if (deployJava.compareVersionToPattern(list[i], patternArray, 
-                                                       familyMatch)) {
-                    return true;
-                }
-            }
-
-            return false;
-        } else {
-            alert('Invalid versionPattern passed to versionCheck: ' + 
-                  versionPattern);
-            return false;
-        }
-    },
-
-
-    /**
-     * Returns true if an installation of Java Web Start of the specified 
-     * minimumVersion can be detected.  minimumVersion is optional, and 
-     * if not specified, '1.4.2' will be used. 
-     * (Versions earlier than 1.4.2 may not be detected.)
-     */
-    isWebStartInstalled: function(minimumVersion) {
-
-        var browser = deployJava.getBrowser();
-        if ((browser == '?') || (browser == 'Safari')) {
-            // we really don't know - better to try to use it than reinstall
-            return true;
-        }
-
-        if (minimumVersion == 'undefined' || minimumVersion == null) {
-            minimumVersion = '1.4.2';
-        }
-
-        var retval = false;
-        var regex = "^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+)(?:_(\\d+))?)?)?$";
-        var matchData = minimumVersion.match(regex);
-
-        if (matchData != null) {
-            retval = deployJava.versionCheck(minimumVersion + '+');
-        } else {
-            if (deployJava.debug) {
-                alert('Invalid minimumVersion argument to isWebStartInstalled(): ' + minimumVersion);
-            }
-            retval = deployJava.versionCheck('1.4.2+');
-        }
-        return retval;
-    },
-  
-  
-    /**
-     * Outputs a launch button for the specified JNLP URL.  When clicked, the 
-     * button will ensure that an appropriate JRE is installed and then launch 
-     * the JNLP application.  minimumVersion is of the form #[.#[.#[_#]]], and 
-     * is the minimum JRE version necessary to run this JNLP application.  
-     * minimumVersion is optional, and if it is not specified, '1.4.2' 
-     * will be used.
-     * If an appropriate JRE or Web Start installation is detected, 
-     * the JNLP application will be launched, otherwise installLatestJRE() 
-     * will be called.
-     *
-     * After installLatestJRE() is called, the script will attempt to detect 
-     * that the JRE installation has completed and launch the JNLP application,
-     * but there are circumstances (such as when the JRE installation 
-     * requires a browser restart) when this cannot be fulfilled.
-     */
-    createWebStartLaunchButton: function(jnlp, minimumVersion) { 
-
-        if (deployJava.returnPage == null) {
-            // if there is an install, come back and run the jnlp file
-            deployJava.returnPage = jnlp;
-        }
-
-        var url = 'javascript:' +
-                  'if (!deployJava.isWebStartInstalled(&quot;' + 
-                      minimumVersion + '&quot;)) {' + 
-                      'if (deployJava.installLatestJRE()) {' + 
-                        'if (deployJava.launch(&quot;' + jnlp + '&quot;)) {}' +
-                      '}' +
-                  '} else {' +
-                      'if (deployJava.launch(&quot;' + jnlp + '&quot;)) {}' +
-                  '}';
-
-        // [#425] Disable WebStart Launch Button for MacOS
-        if (navigator.appVersion.toLowerCase().indexOf("mac")!=-1 &&
-            navigator.userAgent.toLowerCase().indexOf("os x 10_6")==-1 &&
-            navigator.userAgent.toLowerCase().indexOf("os x 10.6")==-1 )
-        {
-          document.write('<' + 'a disabled="disabled"' +
-                       ' onMouseOver="window.status=\'\'; ' +
-                       'return true;"><' + 'img class="disabled"' +
-                       'src="' + deployJava.launchButtonPNG + '" ' +
-                       'border="0" /><' + '/' + 'a' + '>');
-        } else {
-          document.write('<' + 'a href="' + url +
-                       '" onMouseOver="window.status=\'\'; ' +
-                       'return true;"><' + 'img ' +
-                       'src="' + deployJava.launchButtonPNG + '" ' +
-                       'border="0" /><' + '/' + 'a' + '>');
-        }
-    },
-
-
-    /**
-     * Launch a JNLP application, (using the plugin if available)
-     */
-    launch: function(jnlp) {
-      //[#424] Web Start loading via java plugin (Sun deployment script) fails on WinXP
-//        if (deployJava.isPluginInstalled()) {
-//            return deployJava.getPlugin().launch(jnlp);
-//        } else {
-            document.location=jnlp;
-            return true;
-//        }
-    },
-
-    
-    /*
-     * returns true if the ActiveX or XPI plugin is installed
-     */
-    isPluginInstalled: function() {
-        var plugin = deployJava.getPlugin();
-        if (plugin && plugin.jvms) {
-            return true;
-        } else {
-            return false;
-        }
-    },
-    
-    /* 
-     * returns true if the plugin is installed and AutoUpdate is enabled
-     */
-    isAutoUpdateEnabled: function() {
-        if (deployJava.isPluginInstalled()) {
-            return deployJava.getPlugin().isAutoUpdateEnabled();
-        }
-        return false;
-    },
-
-    /* 
-     * sets AutoUpdate on if plugin is installed
-     */
-    setAutoUpdateEnabled: function() { 
-        if (deployJava.isPluginInstalled()) { 
-            return deployJava.getPlugin().setAutoUpdateEnabled(); 
-        }
-        return false;
-    },
-
-    /*
-     * sets the preferred install type : null, online, kernel
-     */
-    setInstallerType: function(type) {
-        deployJava.installType = type;
-        if (deployJava.isPluginInstalled()) {
-            return deployJava.getPlugin().setInstallerType(type);
-        }
-        return false;
-    },
-
-    /*
-     * sets additional package list - to be used by kernel installer
-     */
-    setAdditionalPackages: function(packageList) {
-        if (deployJava.isPluginInstalled()) {
-            return deployJava.getPlugin().setAdditionalPackages(
-                                                     packageList);
-        }
-        return false;
-    },
-
-    /*
-     * sets preference to install Early Access versions if available
-     */
-    setEarlyAccess: function(enabled) {
-        deployJava.EAInstallEnabled = enabled;
-    },
-
-    /*
-     * Determines if the next generation plugin (Plugin II) is default
-     */
-    isPlugin2: function() {
-        if (deployJava.isPluginInstalled()) {
-            try {
-                return deployJava.getPlugin().isPlugin2();
-            } catch (err) {
-                // older plugin w/o isPlugin2() function - just fall through
-            }
-        }
-        return false;
-    },
-       
-
-    getPlugin: function() {
-        deployJava.refresh();
-        var ret = document.getElementById('deployJavaPlugin');
-        return ret;
-    },
-
-    compareVersionToPattern: function(version, patternArray, familyMatch) {
-        var regex = "^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+)(?:_(\\d+))?)?)?$";
-        var matchData = version.match(regex);  
-
-        if (matchData != null) { 
-            var index = 0;
-            var result = new Array();
-
-            for (var i = 1; i < matchData.length; ++i) {
-                if ((typeof matchData[i] == 'string') && (matchData[i] != ''))
-                {
-                    result[index] = matchData[i];
-                    index++;
-                }
-            }
-
-            var l = Math.min(result.length, patternArray.length);
-
-            if (familyMatch) {
-                for (var i = 0; i < l; ++i) {
-                    if (result[i] != patternArray[i]) return false;
-                }
-
-                return true;
-            } else {
-                for (var i = 0; i < l; ++i) {
-                    if (result[i] < patternArray[i]) {
-                        return false;
-                    } else if (result[i] > patternArray[i]) {
-                        return true;
-                    }
-                }
-                
-                return true;
-            }
-        } else {
-            return false;
-        }
-    },
-
-  
-    getBrowser: function() {
-        var browser = navigator.userAgent.toLowerCase();
-    
-        if (deployJava.debug) {
-            alert('userAgent -> ' + browser);
-        }
-
-        if ((navigator.vendor) && 
-            (navigator.vendor.toLowerCase().indexOf('apple') != -1) &&
-            (browser.indexOf('safari') != -1)) {
-            if (deployJava.debug) {
-                alert('We claim to have detected "Safari".');
-            }
-            return 'Safari';
-        } else if (browser.indexOf('msie') != -1) {
-            if (deployJava.debug) {
-                alert('We claim to have detected "IE".');
-            }
-            return 'MSIE';
-//        } else if ((browser.indexOf('konqueror') != -1)) {
-//            if  (deployJava.debug) {
-//                alert('We claim to have detected "Konqueror".');
-//            }
-        } else if ((browser.indexOf('mozilla') != -1) || 
-                   (browser.indexOf('firefox') != -1)) {
-            if (deployJava.debug) {
-                alert('We claim to have detected a Netscape family browser.');
-            }
-            return 'Netscape Family';
-        } else {
-            if (deployJava.debug) {
-                alert('We claim to have failed to detect a browser.');
-            }
-            return '?';
-        }
-    },
-    
-    
-    testUsingActiveX: function(version) {
-        var objectName = 'JavaWebStart.isInstalled.' + version + '.0';
-    
-        if (!ActiveXObject) {
-            if (deployJava.debug) {
-              alert ('Browser claims to be IE, but no ActiveXObject object?');
-            }
-            return false;
-        }
-    
-        try {
-            return (new ActiveXObject(objectName) != null);
-        } catch (exception) {
-            return false;
-        }
-    },
-    
-
-    testForMSVM: function() {
-        var clsid = '{08B0E5C0-4FCB-11CF-AAA5-00401C608500}';
-
-        if (typeof oClientCaps != 'undefined') {
-            var v = oClientCaps.getComponentVersion(clsid, "ComponentID");
-            if ((v == '') || (v == '5,0,5000,0')) {
-                return false;
-            } else {
-                return true;
-            } 
-        } else {
-            return false;
-        }
-    },
-
-    
-    testUsingMimeTypes: function(version) {
-        if (!navigator.mimeTypes) {
-            if (deployJava.debug) {
-                alert ('Browser claims to be Netscape family, but no mimeTypes[] array?');
-            }
-            return false;
-        }
-    
-        for (var i = 0; i < navigator.mimeTypes.length; ++i) {
-            s = navigator.mimeTypes[i].type;
-            var m = s.match(/^application\/x-java-applet\x3Bversion=(1\.8|1\.7|1\.6|1\.5|1\.4\.2)$/);
-            if (m != null) {
-                if (deployJava.compareVersions(m[1], version)) {
-                    return true;   
-                }
-            }
-        }
-        return false;
-    },
-    
-    
-    testUsingPluginsArray: function(version) {
-        if ((!navigator.plugins) || (!navigator.plugins.length)) {
-            if (deployJava.debug) {
-                alert ('Browser claims to be Safari, but no plugins[] array?');
-            }
-            return false;
-        }
-
-        for (var i = 0; i < navigator.plugins.length; ++i) {
-            s = navigator.plugins[i].description;
-    
-            if (s.search(/^Java Switchable Plug-in/) != -1) {
-                return true;
-            }
-    
-            m = s.match(/^Java (1\.4\.2|1\.5|1\.6|1\.7).* Plug-in/);
-            if (m != null) {
-                if (deployJava.compareVersions(m[1], version)) return true; 
-            }
-        }
-        return false;
-    },
-    
-    IEInstall: function() {
-    
-        location.href = deployJava.getJavaURL + 
-            ((deployJava.returnPage != null) ?
-            ('&returnPage=' + deployJava.returnPage) : '') +
-            ((deployJava.locale != null) ?
-            ('&locale=' + deployJava.locale) : '') +
-            ((deployJava.brand != null) ? ('&brand=' + deployJava.brand) : '') +
-            ((deployJava.installType != null) ? 
-             ('&type=' + deployJava.installType) : '');
-
-         // should not actually get here
-         return false;
-    },
-    
-    done: function (name, result) {
-    },
-    
-    FFInstall: function() {
-
-        location.href = deployJava.getJavaURL + 
-            ((deployJava.returnPage != null) ?
-            ('&returnPage=' + deployJava.returnPage) : '') +
-            ((deployJava.locale != null) ?
-            ('&locale=' + deployJava.locale) : '') +
-            ((deployJava.brand != null) ? ('&brand=' + deployJava.brand) : '') +
-            ((deployJava.installType != null) ? 
-                ('&type=' + deployJava.installType) : '');
-
-         // should not actually get here
-         return false;
-    },
-
-    // return true if 'installed' (considered as a JRE version string) is
-    // greater than or equal to 'required' (again, a JRE version string).
-    compareVersions: function(installed, required) {
-
-        var a = installed.split('.');
-        var b = required.split('.');
-    
-        for (var i = 0; i < a.length; ++i) {
-            a[i] = Number(a[i]);
-        }
-        for (var i = 0; i < b.length; ++i) {
-            b[i] = Number(b[i]);
-        }
-        if (a.length == 2) {
-            a[2] = 0;      
-        }
-    
-        if (a[0] > b[0]) return true;
-        if (a[0] < b[0]) return false;
-    
-        if (a[1] > b[1]) return true;
-        if (a[1] < b[1]) return false;
-    
-        if (a[2] > b[2]) return true;
-        if (a[2] < b[2]) return false;
-    
-        return true;
-    },
-    
-    
-    enableAlerts: function() {
-        deployJava.debug = true;
-    },
-
-    poll: function() {
-
-        deployJava.refresh();
-        var postInstallJREList = deployJava.getJREs();           
-
-        if ((deployJava.preInstallJREList.length == 0) && 
-            (postInstallJREList.length != 0)) {
-            clearInterval(deployJava.myInterval);
-            if (deployJava.returnPage != null) {
-                location.href = deployJava.returnPage;
-            };
-        }
-
-        if ((deployJava.preInstallJREList.length != 0) && 
-            (postInstallJREList.length != 0) &&
-            (deployJava.preInstallJREList[0] != postInstallJREList[0])) {
-            clearInterval(deployJava.myInterval);
-            if (deployJava.returnPage != null) {
-                location.href = deployJava.returnPage;
-            }
-        }
-
-    },
-    
-    writePluginTag: function() {
-        var browser = deployJava.getBrowser();
-        if (browser == 'MSIE') {
-            document.write('<' + 
-                'object classid="clsid:CAFEEFAC-DEC7-0000-0000-ABCDEFFEDCBA" ' +
-                'id="deployJavaPlugin" width="0" height="0">' +
-                '<' + '/' + 'object' + '>');
-        } else if (browser == 'Netscape Family') {
-            if (navigator.mimeTypes != null) for (var i=0; 
-                    i < navigator.mimeTypes.length; i++) {
-                if (navigator.mimeTypes[i].type == deployJava.mimeType) {
-                    if (navigator.mimeTypes[i].enabledPlugin) {
-                        document.write('<' + 
-                            'embed id="deployJavaPlugin" type="' + 
-                            deployJava.mimeType + '" hidden="true" />');
-                    }
-                }
-           }
-        }
-    },
-
-    refresh: function() {
-        navigator.plugins.refresh(false);
-
-        var browser = deployJava.getBrowser();
-        if (browser == 'Netscape Family') {
-            var plugin = document.getElementById('deployJavaPlugin');
-            // only do this again if no plugin
-            if (plugin == null) {
-                if (navigator.mimeTypes != null) for (var i=0;
-                    i < navigator.mimeTypes.length; i++) {
-                    if (navigator.mimeTypes[i].type == deployJava.mimeType) {
-                        if (navigator.mimeTypes[i].enabledPlugin) {
-                            document.write('<' +
-                                'embed id="deployJavaPlugin" type="' +
-                                deployJava.mimeType + '" hidden="true" />');
-                        }
-                    }
-               }
-            }
-        }
-    },
-
-    do_initialize: function() {
-        deployJava.writePluginTag();
-        if (deployJava.locale == null) {
-            var loc = null;
-
-            if (loc == null) try {
-                loc = navigator.userLanguage;
-            } catch (err) { }
-
-            if (loc == null) try {
-                loc = navigator.systemLanguage;
-            } catch (err) { }
-    
-            if (loc == null) try {
-                loc = navigator.language;
-            } catch (err) { }
-    
-            if (loc != null) {
-                loc.replace("-","_")
-                deployJava.locale = loc;
-            }
-        }
-    }
-      
-};
-deployJava.do_initialize();
-
diff --git a/mocca-1.2.11/BKUOnline/src/main/webapp/js/deployJava_orig.js b/mocca-1.2.11/BKUOnline/src/main/webapp/js/deployJava_orig.js
deleted file mode 100644
index 316fa278..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/webapp/js/deployJava_orig.js
+++ /dev/null
@@ -1,725 +0,0 @@
-/*
- * Copyright (c)  2008 Sun Microsystems, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- *   - Neither the name of Sun Microsystems nor the names of its
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Added by EGIZ:
- * This file contains workarounds to
- * [#423] Firefox 3.0.11 bug #498132 causes applet loading failure
- *   (lines 95-99)
- * [#424] Web Start loading via java plugin (Sun deployment script) fails on WinXP/Vista
- *   (lines 501-506)
- *
- * features:
- * [#425] Disable WebStart Launch Button for MacOS
- *   (lines 492-504)
- *
- */
-
-/*
- * deployJava.js
- *
- * This file is part of the Deployment Toolkit.  It provides functions for web
- * pages to detect the presence of a JRE, install the latest JRE, and easily run
- * applets or Web Start programs.  Usage guide may be found at http://<TBD>/.
- *
- * The "live" copy of this file may be found at
- * http://java.com/js/deployJava.js.
- * You are encouraged to link directly to the live copy of the file.
- *
- * @version @(#)deployJava.js	XXXXX
- */
-
-var deployJava={
-  debug:null,
-
-  myInterval:null,
-  preInstallJREList:null,
-  returnPage:null,
-  brand:null,
-  locale:null,
-  installType:null,
-
-  EAInstallEnabled:false,
-  EarlyAccessURL:null,
-
-    // GetJava page
-  getJavaURL:'http://java.sun.com/webapps/getjava/BrowserRedirect?host=java.com',
-
-    // Apple redirect page
-  appleRedirectPage:'http://www.apple.com/support/downloads/',
-  oldMimeType:'application/npruntime-scriptable-plugin;DeploymentToolkit',
-  mimeType:'application/java-deployment-toolkit',
-  launchButtonPNG:'http://java.sun.com/products/jfc/tsc/articles/swing2d/webstart.png',
-
-  getJREs:function(){
-    var list=new Array();
-    if(deployJava.isPluginInstalled()){
-      var plugin=deployJava.getPlugin();
-      var VMs=plugin.jvms;
-      for(var i=0;i<VMs.getLength();i++){
-        list[i]=VMs.get(i).version;
-      }
-      }else{
-      var browser=deployJava.getBrowser();
-
-      if(browser=='MSIE'){
-        if(deployJava.testUsingActiveX('1.8.0')){
-          list[0]='1.8.0';
-        }else if(deployJava.testUsingActiveX('1.7.0')){
-          list[0]='1.7.0';
-        }else if(deployJava.testUsingActiveX('1.6.0')){
-          list[0]='1.6.0';
-        }else if(deployJava.testUsingActiveX('1.5.0')){
-          list[0]='1.5.0';
-        }else if(deployJava.testUsingActiveX('1.4.2')){
-          list[0]='1.4.2';
-        }else if(deployJava.testForMSVM()){
-          list[0]='1.1';
-        }
-        }
-      else if(browser=='Netscape Family'){
-        if(deployJava.testUsingMimeTypes('1.8')){
-          list[0]='1.8.0';
-        }else if(deployJava.testUsingMimeTypes('1.7')){
-          list[0]='1.7.0';
-        }else if(deployJava.testUsingMimeTypes('1.6')){
-          list[0]='1.6.0';
-        }else if(deployJava.testUsingMimeTypes('1.5')){
-          list[0]='1.5.0';
-        }else if(deployJava.testUsingMimeTypes('1.4.2')){
-          list[0]='1.4.2';
-        }
-        }else if(browser=='Safari'){
-        if(deployJava.testUsingPluginsArray('1.8.0')){
-          list[0]='1.8.0';
-        }else if(deployJava.testUsingPluginsArray('1.7.0')){
-          list[0]='1.7.0';
-        }else if(deployJava.testUsingPluginsArray('1.6.0')){
-          list[0]='1.6.0';
-        }else if(deployJava.testUsingPluginsArray('1.5.0')){
-          list[0]='1.5.0';
-        }else if(deployJava.testUsingPluginsArray('1.4.2')){
-          list[0]='1.4.2';
-        }
-        }
-      }
-
-    if(deployJava.debug){
-      for(var i=0;i<list.length;++i){
-        alert('We claim to have detected Java SE '+list[i]);
-      }
-      }
-
-    return list;
-  },
-
-  installJRE:function(requestVersion){
-    var ret=false;
-    if(deployJava.isPluginInstalled()){
-      if(deployJava.getPlugin().installJRE(requestVersion)){
-        deployJava.refresh();
-        if(deployJava.returnPage!=null){
-          document.location=deployJava.returnPage;
-        }
-        return true;
-      }else{
-        return false;
-      }
-      }else{
-      return deployJava.installLatestJRE();
-    }
-    },
-
-  installLatestJRE:function(){
-    if(deployJava.isPluginInstalled()){
-      if(deployJava.getPlugin().installLatestJRE()){
-        deployJava.refresh();
-        if(deployJava.returnPage!=null){
-          document.location=deployJava.returnPage;
-        }
-        return true;
-      }else{
-        return false;
-      }
-      }else{
-      var browser=deployJava.getBrowser();
-      var platform=navigator.platform.toLowerCase();
-      if((deployJava.EAInstallEnabled=='true') &&
-         (platform.indexOf('win')!=-1) &&
-         (deployJava.EarlyAccessURL!=null)) {
-
-        deployJava.preInstallJREList=deployJava.getJREs();
-        if(deployJava.returnPage!=null){
-          deployJava.myInterval=
-            setInterval("deployJava.poll()",3000);
-        }
-
-        location.href=deployJava.EarlyAccessURL;
-        return false;
-      }else{
-        if(browser=='MSIE'){
-          return deployJava.IEInstall();
-        }else if((browser=='Netscape Family')&&
-          (platform.indexOf('win32')!=-1)){
-          return deployJava.FFInstall();
-        }else{
-          location.href=deployJava.getJavaURL+
-          ((deployJava.returnPage!=null)?
-          ('&returnPage='+deployJava.returnPage):'')+
-          ((deployJava.locale!=null)?
-          ('&locale='+deployJava.locale):'')+
-          ((deployJava.brand!=null)?
-          ('&brand='+deployJava.brand):'');
-        }
-        return false;
-      }
-      }
-    },
-
-  runApplet:function(attributes,parameters,minimumVersion){
-    if(minimumVersion=='undefined'||minimumVersion==null){
-      minimumVersion='1.1';
-    }
-
-    var regex="^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+)(?:_(\\d+))?)?)?$";
-
-    var matchData=minimumVersion.match(regex);
-
-    if(deployJava.returnPage==null){
-      deployJava.returnPage=document.location;
-    }
-
-    if(matchData!=null){
-      var browser=deployJava.getBrowser();
-      if((browser!='?')&&(browser!='Safari')){
-        if(deployJava.versionCheck(minimumVersion+'+')){
-          deployJava.writeAppletTag(attributes,parameters);
-        }else if(deployJava.installJRE(minimumVersion+'+')){
-          deployJava.refresh();
-          location.href=document.location;
-          deployJava.writeAppletTag(attributes,parameters);
-        }
-        }else{
-        deployJava.writeAppletTag(attributes,parameters);
-      }
-      }else{
-      if(deployJava.debug){
-        alert('Invalid minimumVersion argument to runApplet():'+
-          minimumVersion);
-      }
-      }
-    },
-
-  writeAppletTag:function(attributes,parameters){
-    var s='<'+'applet ';
-    for(var attribute in attributes){
-      s+=(' '+attribute+'="'+attributes[attribute]+'"');
-    }
-    s+='>';
-    document.write(s);
-
-    if(parameters!='undefined'&&parameters!=null){
-      var codebaseParam=false;
-      for(var parameter in parameters){
-        if(parameter=='codebase_lookup'){
-          codebaseParam=true;
-        }
-        s='<param name="'+parameter+'" value="'+
-        parameters[parameter]+'">';
-      document.write(s);
-      }
-      if(!codebaseParam){
-        document.write('<param name="codebase_lookup" value="false">');
-      }
-      }
-    document.write('<'+'/'+'applet'+'>');
-  },
-
-  versionCheck:function(versionPattern)
-
-  {
-    var index=0;
-    var regex="^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+)(?:_(\\d+))?)?)?(\\*|\\+)?$";
-
-    var matchData=versionPattern.match(regex);
-
-    if(matchData!=null){
-      var familyMatch=true;
-
-      var patternArray=new Array();
-
-      for(var i=1;i<matchData.length;++i){
-        if((typeof matchData[i]=='string')&&(matchData[i]!='')){
-          patternArray[index]=matchData[i];
-          index++;
-        }
-        }
-
-      if(patternArray[patternArray.length-1]=='+'){
-        familyMatch=false;
-        patternArray.length--;
-      }else{
-        if(patternArray[patternArray.length-1]=='*'){
-          patternArray.length--;
-        }
-        }
-
-      var list=deployJava.getJREs();
-      for(var i=0;i<list.length;++i){
-        if(deployJava.compareVersionToPattern(list[i],patternArray,
-        familyMatch)){
-          return true;
-        }
-        }
-
-      return false;
-    }else{
-      alert('Invalid versionPattern passed to versionCheck: '+
-        versionPattern);
-      return false;
-    }
-    },
-
-  isWebStartInstalled:function(minimumVersion){
-
-    var browser=deployJava.getBrowser();
-    if((browser=='?')||(browser=='Safari')){
-      return true;
-    }
-
-    if(minimumVersion=='undefined'||minimumVersion==null){
-      minimumVersion='1.4.2';
-    }
-
-    var retval=false;
-    var regex="^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+)(?:_(\\d+))?)?)?$";
-    var matchData=minimumVersion.match(regex);
-
-    if(matchData!=null){
-      retval=deployJava.versionCheck(minimumVersion+'+');
-    }else{
-      if(deployJava.debug){
-        alert('Invalid minimumVersion argument to isWebStartInstalled(): '+minimumVersion);
-      }
-      retval=deployJava.versionCheck('1.4.2+');
-    }
-    return retval;
-  },
-
-  createWebStartLaunchButton:function(jnlp,minimumVersion){
-    
-    if(deployJava.returnPage==null){
-      deployJava.returnPage=jnlp;
-    }
-    var url='javascript:'+'if (!deployJava.isWebStartInstalled(&quot;'+
-    minimumVersion+'&quot;)) {'+'if (deployJava.installLatestJRE()) {'+'if (deployJava.launch(&quot;'+jnlp+'&quot;)) {}'+'}'+'} else {'+'if (deployJava.launch(&quot;'+jnlp+'&quot;)) {}'+'}';document.write('<'+'a href="'+url+'" onMouseOver="window.status=\'\'; '+'return true;"><'+'img '+'src="'+deployJava.launchButtonPNG+'" '+'border="0" /><'+'/'+'a'+'>');
-  },
-
-  launch:function(jnlp){
-    if(deployJava.isPluginInstalled()){
-      return deployJava.getPlugin().launch(jnlp);
-    }else{
-      document.location=jnlp;return true;
-    }
-    },
-
-  isPluginInstalled:function(){
-    var plugin=deployJava.getPlugin();
-    if(plugin&&plugin.jvms){
-      return true;
-    }else{
-      return false;
-    }
-    },
-
-  isAutoUpdateEnabled:function(){
-    if(deployJava.isPluginInstalled()){
-      return deployJava.getPlugin().isAutoUpdateEnabled();
-    }
-    return false;
-  },
-
-  setAutoUpdateEnabled:function(){
-    if(deployJava.isPluginInstalled()){
-      return deployJava.getPlugin().setAutoUpdateEnabled();
-    }
-    return false;
-  },
-
-  setInstallerType:function(type){
-    deployJava.installType=type;
-    if(deployJava.isPluginInstalled()){
-      return deployJava.getPlugin().setInstallerType(type);
-    }
-    return false;
-  },
-
-  setAdditionalPackages:function(packageList){
-    if(deployJava.isPluginInstalled()){
-      return deployJava.getPlugin().setAdditionalPackages(
-      packageList);
-    }
-    return false;
-  },
-
-  setEarlyAccess:function(enabled){
-    deployJava.EAInstallEnabled=enabled;
-  },
-
-  isPlugin2:function(){
-    if(deployJava.isPluginInstalled()){
-      if(deployJava.versionCheck('1.6.0_10+')){
-        try{
-          return deployJava.getPlugin().isPlugin2();
-        }catch(err){
-
-        }
-        }
-      }
-    return false;
-  },
-
-
-  getPlugin:function(){
-    deployJava.refresh();
-    var ret=document.getElementById('deployJavaPlugin');
-    return ret;
-  },
-
-  compareVersionToPattern:function(version,patternArray,familyMatch){
-    var regex="^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+)(?:_(\\d+))?)?)?$";
-    var matchData=version.match(regex);
-
-    if(matchData!=null){
-      var index=0;
-      var result=new Array();
-
-      for(var i=1;i<matchData.length;++i){
-        if((typeof matchData[i]=='string')&&(matchData[i]!=''))
-        {
-          result[index]=matchData[i];
-          index++;
-        }
-        }
-
-      var l=Math.min(result.length,patternArray.length);
-
-      if(familyMatch){
-        for(var i=0;i<l;++i){
-          if(result[i]!=patternArray[i])return false;
-        }
-
-        return true;
-      }else{
-        for(var i=0;i<l;++i){
-          if(result[i]<patternArray[i]){
-            return false;
-          }else if(result[i]>patternArray[i]){
-            return true;
-          }
-          }
-
-        return true;
-      }
-      }else{
-      return false;
-    }
-    },
-
-
-  getBrowser:function(){
-    var browser=navigator.userAgent.toLowerCase();
-
-    if(deployJava.debug){
-      alert('userAgent -> '+browser);
-    }
-
-    if((navigator.vendor)&&
-      (navigator.vendor.toLowerCase().indexOf('apple')!=-1)&&
-      (browser.indexOf('safari')!=-1)){
-      if(deployJava.debug){
-        alert('We claim to have detected "Safari".');
-      }
-      return'Safari';
-    }else if(browser.indexOf('msie')!=-1){
-      if(deployJava.debug){
-        alert('We claim to have detected "IE".');
-      }
-      return'MSIE';
-    }else if((browser.indexOf('mozilla')!=-1)||
-      (browser.indexOf('firefox')!=-1)){
-      if(deployJava.debug){
-        alert('We claim to have detected a Netscape family browser.');
-      }
-      return'Netscape Family';
-    }else{
-      if(deployJava.debug){
-        alert('We claim to have failed to detect a browser.');
-      }
-      return'?';
-    }
-    },
-
-
-  testUsingActiveX:function(version){
-    var objectName='JavaWebStart.isInstalled.'+version+'.0';
-
-    if(!ActiveXObject){
-      if(deployJava.debug){
-        alert('Browser claims to be IE, but no ActiveXObject object?');
-      }
-      return false;
-    }
-
-    try{
-      return(new ActiveXObject(objectName)!=null);
-    }catch(exception){
-      return false;
-    }
-    },
-
-
-  testForMSVM:function(){
-    var clsid='{08B0E5C0-4FCB-11CF-AAA5-00401C608500}';
-
-    if(typeof oClientCaps!='undefined'){
-      var v=oClientCaps.getComponentVersion(clsid,"ComponentID");
-      if((v=='')||(v=='5,0,5000,0')){
-        return false;
-      }else{
-        return true;
-      }
-      }else{
-      return false;
-    }
-    },
-
-
-  testUsingMimeTypes:function(version){
-    if(!navigator.mimeTypes){
-      if(deployJava.debug){
-        alert('Browser claims to be Netscape family, but no mimeTypes[] array?');
-      }
-      return false;
-    }
-
-    for(var i=0;i<navigator.mimeTypes.length;++i){
-      s=navigator.mimeTypes[i].type;
-      var m=s.match(/^application\/x-java-applet\x3Bversion=(1\.8|1\.7|1\.6|1\.5|1\.4\.2)$/);
-      if(m!=null){
-        if(deployJava.compareVersions(m[1],version)){
-          return true;
-        }
-        }
-      }
-    return false;
-  },
-
-
-  testUsingPluginsArray:function(version){
-    if((!navigator.plugins)||(!navigator.plugins.length)){
-      return false;
-    }
-    var platform=navigator.platform.toLowerCase();
-    for(var i=0;i<navigator.plugins.length;++i){
-      s=navigator.plugins[i].description;
-
-      if(s.search(/^Java Switchable Plug-in (Cocoa)/)!=-1){
-        if(deployJava.compareVersions("1.5.0",version)){
-          return true;
-        }
-        }else if(s.search(/^Java/)!=-1){
-        if(platform.indexOf('win')!=-1){
-          if(deployJava.compareVersions("1.5.0",version)||deployJava.compareVersions("1.6.0",version)){
-            return true;
-          }
-          }
-        }
-      }
-    if(deployJava.compareVersions("1.5.0",version)){
-      return true;
-    }
-    return false;
-  },
-
-  IEInstall:function(){
-
-    location.href=deployJava.getJavaURL+
-    ((deployJava.returnPage!=null)?
-    ('&returnPage='+deployJava.returnPage):'')+
-    ((deployJava.locale!=null)?
-    ('&locale='+deployJava.locale):'')+
-    ((deployJava.brand!=null)?('&brand='+deployJava.brand):'')+
-    ((deployJava.installType!=null)?
-    ('&type='+deployJava.installType):'');
-  return false;
-  },
-
-  done:function(name,result){
-  },
-
-  FFInstall:function(){
-
-    location.href=deployJava.getJavaURL+
-    ((deployJava.returnPage!=null)?
-    ('&returnPage='+deployJava.returnPage):'')+
-    ((deployJava.locale!=null)?
-    ('&locale='+deployJava.locale):'')+
-    ((deployJava.brand!=null)?('&brand='+deployJava.brand):'')+
-    ((deployJava.installType!=null)?
-    ('&type='+deployJava.installType):'');
-  return false;
-  },
-
-  compareVersions:function(installed,required){
-
-    var a=installed.split('.');
-    var b=required.split('.');
-
-    for(var i=0;i<a.length;++i){
-      a[i]=Number(a[i]);
-    }
-    for(var i=0;i<b.length;++i){
-      b[i]=Number(b[i]);
-    }
-    if(a.length==2){
-      a[2]=0;
-    }
-
-    if(a[0]>b[0])return true;
-    if(a[0]<b[0])return false;
-
-    if(a[1]>b[1])return true;
-    if(a[1]<b[1])return false;
-
-    if(a[2]>b[2])return true;
-    if(a[2]<b[2])return false;
-
-    return true;
-  },
-
-
-  enableAlerts:function(){
-    deployJava.debug=true;
-  },
-
-  poll:function(){
-
-    deployJava.refresh();
-    var postInstallJREList=deployJava.getJREs();
-
-    if((deployJava.preInstallJREList.length==0)&&
-      (postInstallJREList.length!=0)){
-      clearInterval(deployJava.myInterval);
-      if(deployJava.returnPage!=null){
-        location.href=deployJava.returnPage;
-      };
-    }
-
-    if((deployJava.preInstallJREList.length!=0)&&
-      (postInstallJREList.length!=0)&&
-      (deployJava.preInstallJREList[0]!=postInstallJREList[0])){
-      clearInterval(deployJava.myInterval);
-      if(deployJava.returnPage!=null){
-        location.href=deployJava.returnPage;
-      }
-      }
-
-    },
-
-  writePluginTag:function(){
-    var browser=deployJava.getBrowser();
-    if(browser=='MSIE'){
-      document.write('<'+
-        'object classid="clsid:CAFEEFAC-DEC7-0000-0000-ABCDEFFEDCBA" '+
-        'id="deployJavaPlugin" width="0" height="0">'+
-        '<'+'/'+'object'+'>');
-    }else if(browser=='Netscape Family'){
-      deployJava.writeEmbedTag();
-    }
-    },
-
-  refresh:function(){
-    navigator.plugins.refresh(false);var browser=deployJava.getBrowser();if(browser=='Netscape Family'){
-      var plugin=document.getElementById('deployJavaPlugin');if(plugin==null){
-        deployJava.writeEmbedTag();
-      }
-      }
-    },
-
-  writeEmbedTag:function(){
-    var written=false;if(navigator.mimeTypes!=null){
-      for(var i=0;i<navigator.mimeTypes.length;i++){
-        if(navigator.mimeTypes[i].type==deployJava.mimeType){
-          if(navigator.mimeTypes[i].enabledPlugin){
-            document.write('<'+'embed id="deployJavaPlugin" type="'+
-              deployJava.mimeType+'" hidden="true" />');written=true;
-          }
-          }
-        }
-      if(!written)for(var i=0;i<navigator.mimeTypes.length;i++){
-        if(navigator.mimeTypes[i].type==deployJava.oldMimeType){
-          if(navigator.mimeTypes[i].enabledPlugin){
-            document.write('<'+'embed id="deployJavaPlugin" type="'+
-              deployJava.oldMimeType+'" hidden="true" />');
-          }
-          }
-        }
-      }
-    },
-    
-  do_initialize:function(){
-    deployJava.writePluginTag();
-    if(deployJava.locale==null){
-      var loc=null;
-
-      if(loc==null)try{
-        loc=navigator.userLanguage;
-      }catch(err){}
-
-      if(loc==null)try{
-        loc=navigator.systemLanguage;
-      }catch(err){}
-
-      if(loc==null)try{
-        loc=navigator.language;
-      }catch(err){}
-
-      if(loc!=null){
-        loc.replace("-","_")
-        deployJava.locale=loc;
-      }
-      }
-    }
-
-  };
-  deployJava.do_initialize();
-
diff --git a/mocca-1.2.11/BKUOnline/src/main/wsdl/CardChannel.xsd b/mocca-1.2.11/BKUOnline/src/main/wsdl/CardChannel.xsd
deleted file mode 100644
index 81fd85db..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/wsdl/CardChannel.xsd
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.buergerkarte.at/cardchannel"
-    xmlns:tns="http://www.buergerkarte.at/cardchannel"
-    elementFormDefault="qualified"
-    xmlns:stal="http://www.egiz.gv.at/stal">
-
-    <xs:import namespace="http://www.egiz.gv.at/stal" schemaLocation="stal-service.xsd"/>
-
-    <xs:annotation>
-        <xs:documentation>Schema for transparent access to cards using a BKU and the CardChannel
-            infobox</xs:documentation>
-    </xs:annotation>
-    
-    <xs:element name="Script" type="tns:ScriptType" substitutionGroup="stal:OtherRequest"/>
-    <xs:element name="Response" type="tns:ResponseType" substitutionGroup="stal:OtherResponse"/>
-    <xs:element name="Grunddaten" type="tns:AttributeList"/>
-    <xs:element name="EHIC" type="tns:AttributeList"/>
-    <xs:element name="Status" type="tns:AttributeList"/>
-    <xs:element name="SV-Personenbindung" type="xs:hexBinary"/>
-    
-    <xs:complexType name="ScriptType">
-        <xs:annotation>
-            <xs:documentation>extends abstract stal:RequestType</xs:documentation>
-        </xs:annotation>
-        <xs:complexContent>
-            <xs:extension base="stal:RequestType">
-                <xs:annotation>
-                    <xs:documentation>Contains the script to be executed by the BKU</xs:documentation>
-                </xs:annotation>
-                <xs:choice maxOccurs="unbounded" minOccurs="1">
-                    <xs:element name="Reset" type="tns:ResetType"/>
-                    <xs:element name="CommandAPDU" type="tns:CommandAPDUType"/>
-                    <xs:element name="VerifyAPDU" type="tns:VerifyAPDUType"/>
-                </xs:choice>
-            </xs:extension>
-        </xs:complexContent>
-    </xs:complexType>
-    
-    <xs:complexType name="ResponseType">
-        <xs:annotation>
-            <xs:documentation>extends abstract stal:ResponseType</xs:documentation>
-        </xs:annotation>
-        <xs:complexContent>
-            <xs:extension base="stal:ResponseType">
-                <xs:annotation>
-                    <xs:documentation>Contains the result of the script executed by the
-                        BKU</xs:documentation>
-                </xs:annotation>
-                <xs:choice maxOccurs="unbounded" minOccurs="1">
-                    <xs:element name="ATR" type="tns:ATRType"/>
-                    <xs:element name="ResponseAPDU" type="tns:ResponseAPDUType"/>
-                </xs:choice>
-            </xs:extension>
-        </xs:complexContent>
-    </xs:complexType>
-    
-    <xs:complexType name="ResetType">
-        <xs:annotation>
-            <xs:documentation>Reset the icc and sequence counter</xs:documentation>
-        </xs:annotation>
-        <xs:attribute name="cold" type="xs:boolean" default="true"/>
-    </xs:complexType>
-    
-    <xs:complexType name="CommandAPDUType">
-        <xs:annotation>
-            <xs:documentation>Contains a sequence of bytes send as command APDU to the
-                icc</xs:documentation>
-        </xs:annotation>
-        <xs:simpleContent>
-            <xs:extension base="xs:hexBinary">
-                <xs:attribute name="sequence" type="xs:positiveInteger" use="required"/>
-                <xs:attribute name="of" type="xs:positiveInteger" use="required"/>
-                <xs:attribute name="expectedSW" type="xs:hexBinary"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    
-    <xs:complexType name="VerifyAPDUType">
-        <xs:annotation>
-            <xs:documentation>Contains a sequence of bytes send as command APDU to the icc after a
-                PIN entered by the user has been incorporated into the APDU</xs:documentation>
-        </xs:annotation>
-        <xs:simpleContent>
-            <xs:extension base="xs:hexBinary">
-                <xs:attribute name="sequence" type="xs:positiveInteger" use="required"/>
-                <xs:attribute name="of" type="xs:positiveInteger" use="required"/>
-                <xs:attribute name="expectedSW" type="xs:hexBinary"/>
-                <xs:attribute name="message" type="xs:string" use="required"/>
-                <xs:attribute name="format" type="xs:hexBinary" use="required"/>
-                <xs:attribute name="offset" type="xs:nonNegativeInteger" use="required"/>
-                <xs:attribute name="timeout" type="xs:nonNegativeInteger" use="required"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    
-    <xs:complexType name="ATRType">
-        <xs:annotation>
-            <xs:documentation>Contains the ATR received as reponse to a Reset
-                command</xs:documentation>
-        </xs:annotation>
-        <xs:simpleContent>
-            <xs:extension base="xs:hexBinary">
-                <xs:attribute name="rc" type="xs:integer" default="0"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    
-    <xs:complexType name="ResponseAPDUType">
-        <xs:annotation>
-            <xs:documentation>Contains a sequence of bytes received from the card as response
-                APDU</xs:documentation>
-        </xs:annotation>
-        <xs:simpleContent>
-            <xs:extension base="xs:hexBinary">
-                <xs:attribute name="sequence" type="xs:positiveInteger" use="required"/>
-                <xs:attribute name="rc" type="xs:integer" default="0"/>
-                <xs:attribute name="SW" type="xs:hexBinary" default="9000"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    
-    <xs:complexType name="AttributeList">
-        <xs:annotation>
-            <xs:documentation>Contains a list of attributes</xs:documentation>
-        </xs:annotation>
-        <xs:sequence>
-            <xs:element name="Attribute" type="tns:AttributeType" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-    </xs:complexType>
-    
-    <xs:complexType name="AttributeType">
-        <xs:annotation>
-            <xs:documentation>Contains an attribute converted from ASN.1</xs:documentation>
-        </xs:annotation>
-        <xs:sequence>
-            <xs:element name="Integer" type="xs:integer" minOccurs="0" maxOccurs="1"/>
-            <xs:element name="Latin1String" type="xs:string" minOccurs="0" maxOccurs="1"/>
-            <xs:element name="UTF8String" type="xs:string" minOccurs="0" maxOccurs="1"/>
-            <xs:element name="NumericString" type="xs:string" minOccurs="0" maxOccurs="1"/>
-            <xs:element name="PrintableString" type="xs:string" minOccurs="0" maxOccurs="1"/>
-            <xs:element name="GeneralizedTime" type="xs:dateTime" minOccurs="0" maxOccurs="1"/>
-            <xs:element name="Date" type="xs:string" minOccurs="0" maxOccurs="1"/>
-        </xs:sequence>
-        <xs:attribute name="oid" type="xs:string" use="required"/>
-    </xs:complexType>
-    
-</xs:schema>
diff --git a/mocca-1.2.11/BKUOnline/src/main/wsdl/stal-service.wsdl b/mocca-1.2.11/BKUOnline/src/main/wsdl/stal-service.wsdl
deleted file mode 100644
index 3e6f5730..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/wsdl/stal-service.wsdl
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2008 Federal Chancellery Austria and
-  Graz University of Technology
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<!--
- |   This WSDL contains the original WSDL that was used to generate all classes in the STALService module
- |-->
-<definitions name="stal" targetNamespace="http://www.egiz.gv.at/wsdl/stal"
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:tns="http://www.egiz.gv.at/wsdl/stal"
-    xmlns:stal="http://www.egiz.gv.at/stal"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:cc="http://www.buergerkarte.at/cardchannel">
-    <types>
-        <xsd:schema targetNamespace="http://www.egiz.gv.at/wsdl/stal">
-            <xsd:import namespace="http://www.egiz.gv.at/stal" schemaLocation="stal-service.xsd"/>
-        </xsd:schema>
-        <xsd:schema targetNamespace="http://www.egiz.gv.at/wsdl/stal-extended">
-            <xsd:import namespace="http://www.buergerkarte.at/cardchannel" schemaLocation="CardChannel.xsd"/>
-        </xsd:schema>
-    </types>
-    <message name="ConnectRequest">
-        <part name="part1" element="stal:SessionId"/>
-    </message>
-    <message name="NextRequestRequest">
-        <part name="part1" element="stal:GetNextRequest"/>
-    </message>
-    <message name="NextRequestResponse">
-        <part name="part1" element="stal:GetNextRequestResponse"/>
-    </message>
-    <message name="GetHashDataInputRequest">
-        <part name="part1" element="stal:GetHashDataInput"/>
-    </message>
-    <message name="GetHashDataInputResponse">
-        <part name="part1" element="stal:GetHashDataInputResponse"/>
-    </message>
-    <message name="GetHashDataInputFault">
-        <part name="part1" element="stal:GetHashDataInputFault"/>
-    </message>
-    
-    <!--
-     |  Comment out the remainder of this WSDL
-     |  if placing it into webapp/WEB-INF/wsdl/
-     |  in order not to interfere with the actual WSDL stal.wsdl
-     |-->
-    <portType name="STALPortType">
-        <operation name="connect">
-            <input name="input3" message="tns:ConnectRequest"/>
-            <output name="output3" message="tns:NextRequestResponse"/>
-        </operation>
-        <operation name="nextRequest">
-            <input name="input1" message="tns:NextRequestRequest"/>
-            <output name="output1" message="tns:NextRequestResponse"/>
-        </operation>
-        <operation name="getHashDataInput">
-            <input name="input2" message="tns:GetHashDataInputRequest"/>
-            <output name="output2" message="tns:GetHashDataInputResponse"/>
-            <fault name="fault1" message="tns:GetHashDataInputFault"/>
-        </operation>
-    </portType>
-    <binding name="STALBinding" type="tns:STALPortType">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <operation name="connect">
-            <input name="input3">
-              <soap:body use="literal"/>
-            </input>
-            <output name="output3">
-              <soap:body use="literal"/>
-            </output>
-        </operation>
-        <operation name="nextRequest">
-            <soap:operation/>
-            <input name="input1">
-                <soap:body use="literal"/>
-            </input>
-            <output name="output1">
-                <soap:body use="literal"/>
-            </output>
-        </operation>
-        <operation name="getHashDataInput">
-            <soap:operation/>
-            <input name="input2">
-                <soap:body use="literal"/>
-            </input>
-            <output name="output2">
-                <soap:body use="literal"/>
-            </output>
-            <fault name="fault1">
-                <soap:fault name="fault1"/>
-            </fault>
-        </operation>
-    </binding>
-    <service name="STALService">
-        <port name="STALPort" binding="tns:STALBinding">
-            <soap:address location="http://localhost:${HttpDefaultPort}/stal"/>
-        </port>
-    </service>
-</definitions>
diff --git a/mocca-1.2.11/BKUOnline/src/main/wsdl/stal-service.xsd b/mocca-1.2.11/BKUOnline/src/main/wsdl/stal-service.xsd
deleted file mode 100644
index 177b9e7f..00000000
--- a/mocca-1.2.11/BKUOnline/src/main/wsdl/stal-service.xsd
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2008 Federal Chancellery Austria and
-  Graz University of Technology
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.egiz.gv.at/stal"
-    xmlns:tns="http://www.egiz.gv.at/stal"
-    xmlns:cc="http://www.buergerkarte.at/cardchannel"
-    elementFormDefault="qualified">
-
-  <import namespace="http://www.buergerkarte.at/cardchannel" schemaLocation="CardChannel.xsd"/>
-
-  <element name="SessionId" type="string"/>
-  <element name="GetNextRequest" type="tns:GetNextRequestType"/>
-  <element name="GetNextRequestResponse" type="tns:GetNextRequestResponseType"/>
-  <element name="GetHashDataInput" type="tns:GetHashDataInputType"/>
-  <element name="GetHashDataInputResponse" type="tns:GetHashDataInputResponseType"/>
-  <element name="GetHashDataInputFault" type="tns:GetHashDataInputFaultType"/>
-
-  <!-- Abstract Request/Response to be substituted by extending schemata -->
-  <element name="OtherRequest" type="tns:RequestType" abstract="true"/>
-  <element name="OtherResponse" type="tns:ResponseType" abstract="true"/>
-
-  <complexType name="GetNextRequestType">
-        <!-- abstract Request/Response type not supported by JAX-WS 2.0 (jdk < 1.6.0_04)  
-        <sequence>
-            <element name="Response" type="tns:ResponseType"  minOccurs="0"  maxOccurs="unbounded"/>
-        </sequence-->
-    <choice maxOccurs="unbounded">
-      <element name="InfoboxReadResponse" type="tns:InfoboxReadResponseType"/>
-      <element name="SignResponse" type="tns:SignResponseType"/>
-      <element name="ErrorResponse" type="tns:ErrorResponseType"/>
-      <element name="StatusResponse" type="tns:StatusResponseType"/>
-      <element ref="tns:OtherResponse"/>
-      <!-- do not list cc:Script here, JAXB knows about substitution groups
-      <element ref="cc:Script"/-->
-    </choice>
-    <attribute name="SessionId" type="string"/>
-  </complexType>
-  <complexType name="ResponseType" abstract="true" />
-  <complexType name="InfoboxReadResponseType">
-    <complexContent>
-      <extension base="tns:ResponseType">
-        <sequence>
-          <element name="InfoboxValue" type="base64Binary"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="SignResponseType">
-    <complexContent>
-      <extension base="tns:ResponseType">
-        <sequence>
-          <element name="SignatureValue" type="base64Binary"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="ErrorResponseType">
-    <complexContent>
-      <extension base="tns:ResponseType">
-        <sequence>
-          <element name="ErrorCode" type="int"/>
-          <element name="ErrorMessage" type="string"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="StatusResponseType">
-    <complexContent>
-      <extension base="tns:ResponseType">
-        <attribute name="cardReady" type="boolean" />
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="GetNextRequestResponseType">
-        <!-- abstract Request/Response type not supported by JAX-WS 2.0 (jdk < 1.6.0_04) 
-        <sequence>
-            <element name="Request" type="tns:RequestType" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence-->
-    <choice maxOccurs="unbounded">
-      <element name="InfoboxReadRequest" type="tns:InfoboxReadRequestType"/>
-      <element name="SignRequest" type="tns:SignRequestType"/>
-      <element name="QuitRequest" type="tns:QuitRequestType"/>
-      <element name="StatusRequest" type="tns:StatusRequestType"/>
-      <element ref="tns:OtherRequest"/>
-      <!-- do not list cc:Response here, JAXB knows about substitution groups
-      <element ref="cc:Response"/-->
-    </choice>
-    <attribute name="SessionId" type="string"/>
-  </complexType>
-  <complexType name="RequestType" abstract="true"/>
-  <complexType name="InfoboxReadRequestType">
-    <complexContent>
-      <extension base="tns:RequestType">
-        <sequence>
-          <element name="InfoboxIdentifier">
-            <simpleType>
-              <restriction base="string">
-                <enumeration value="Certificates"/>
-                <enumeration value="IdentityLink"/>
-                <enumeration value="Mandates"/>
-              </restriction>
-            </simpleType>
-          </element>
-          <element name="DomainIdentifier" type="anyURI" minOccurs="0"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="SignRequestType">
-    <complexContent>
-      <extension base="tns:RequestType">
-        <sequence>
-          <element name="KeyIdentifier">
-            <simpleType>
-              <restriction base="string">
-                <enumeration value="SecureSignatureKeypair"/>
-                <enumeration value="CertifiedKeypair"/>
-              </restriction>
-            </simpleType>
-          </element>
-          <element name="SignedInfo" type="base64Binary"/>
-        </sequence>
-      </extension>
-    </complexContent>
-  </complexType>
-  <complexType name="QuitRequestType">
-    <complexContent>
-      <extension base="tns:RequestType"/>
-    </complexContent>
-  </complexType>
-  <complexType name="StatusRequestType">
-    <complexContent>
-      <extension base="tns:RequestType"/>
-    </complexContent>
-  </complexType>
-  <complexType name="GetHashDataInputType">
-    <sequence>
-      <element name="Reference" maxOccurs="unbounded">
-        <complexType>
-          <attribute name="ID" type="string"/>
-        </complexType>
-      </element>
-    </sequence>
-    <attribute name="SessionId" type="string"/>
-  </complexType>
-  <complexType name="GetHashDataInputResponseType">
-    <sequence>
-      <element name="Reference" maxOccurs="unbounded">
-        <complexType>
-          <simpleContent>
-            <extension base="base64Binary">
-              <attribute name="ID" type="string"/>
-              <attribute name="MimeType" type="string" use="optional"/>
-              <attribute name="Encoding" type="string" use="optional"/>
-              <attribute name="Filename" type="string" use="optional"/>
-            </extension>
-          </simpleContent>
-        </complexType>
-      </element>
-    </sequence>
-    <attribute name="SessionId" type="string"/>
-  </complexType>
-  <complexType name="GetHashDataInputFaultType">
-    <sequence>
-      <element name="ErrorCode" type="int"/>
-      <element name="ErrorMessage" type="string"/>
-    </sequence>
-  </complexType>
-</schema>
diff --git a/mocca-1.2.11/BKUOnline/src/test/java/at/gv/egiz/bku/online/conf/SSLConfigTest.java b/mocca-1.2.11/BKUOnline/src/test/java/at/gv/egiz/bku/online/conf/SSLConfigTest.java
deleted file mode 100644
index eefaf5b6..00000000
--- a/mocca-1.2.11/BKUOnline/src/test/java/at/gv/egiz/bku/online/conf/SSLConfigTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package at.gv.egiz.bku.online.conf;

-

-import java.net.URL;

-

-import javax.net.ssl.HttpsURLConnection;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Ignore;

-import org.junit.Test;

-import org.springframework.context.ApplicationContext;

-import org.springframework.context.support.ClassPathXmlApplicationContext;

-

-@Ignore

-public class SSLConfigTest {

-	

-	private SpringConfigurator cfg;

-	private ApplicationContext ctx;

-		

-	@Before

-	public void setUp() throws Exception {

-		ctx = new ClassPathXmlApplicationContext("applicationContext.xml");

-		

-	}

-

-	@Ignore

-	@Test

-	public void testConnect() throws Exception {

-		String url = "https://apps.egiz.gv.at/exchange-moa-id-auth/VerifyIdentityLink?MOASessionID=8151862969943601574";

-		URL u = new URL(url);

-		HttpsURLConnection uc = (HttpsURLConnection) u.openConnection();

-		uc.connect();

-		System.out.println(uc.getCipherSuite());

-	}

-	

-	@After

-	public void shutDown() {

-		

-	}

-}

diff --git a/mocca-1.2.11/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java b/mocca-1.2.11/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java
deleted file mode 100644
index 741974eb..00000000
--- a/mocca-1.2.11/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java
+++ /dev/null
@@ -1,534 +0,0 @@
-/*
-* Copyright 2008 Federal Chancellery Austria and
-* Graz University of Technology
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package at.gv.egiz.stal.service;
-
-import at.gv.egiz.stal.service.impl.STALRequestBrokerImpl;
-import at.gv.egiz.stal.service.impl.RequestBrokerSTALFactory;
-import at.gv.egiz.stal.service.impl.STALRequestBroker;
-import at.gv.egiz.stal.ErrorResponse;
-import at.gv.egiz.stal.HashDataInput;
-import at.gv.egiz.stal.InfoboxReadRequest;
-import at.gv.egiz.stal.InfoboxReadResponse;
-import at.gv.egiz.stal.QuitRequest;
-import at.gv.egiz.stal.STALRequest;
-import at.gv.egiz.stal.STALResponse;
-import at.gv.egiz.stal.SignResponse;
-import at.gv.egiz.stal.SignRequest;
-import at.gv.egiz.stal.service.types.InfoboxReadRequestType;
-import at.gv.egiz.stal.service.types.InfoboxReadResponseType;
-import at.gv.egiz.stal.service.types.ObjectFactory;
-import at.gv.egiz.stal.service.types.QuitRequestType;
-import at.gv.egiz.stal.service.types.RequestType;
-import at.gv.egiz.stal.service.types.ResponseType;
-import at.gv.egiz.stal.service.types.SignRequestType;
-import at.gv.egiz.stal.service.types.SignResponseType;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import javax.xml.bind.JAXBElement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- *
- * @author clemens
- */
-@Ignore
-public class STALRequestBrokerTest {
-
-    private static final Log log = LogFactory.getLog(STALRequestBrokerTest.class);
-    protected static STALRequestBroker stal;
-
-    @BeforeClass
-    public static void setUp() {
-        RequestBrokerSTALFactory fac = new RequestBrokerSTALFactory();
-        stal = (STALRequestBrokerImpl) fac.createSTAL();
-        log.debug("Created STAL " + stal.getClass().getName());
-    }
-
-    @Ignore
-    public void testInfoboxRead() {
-//        try {
-
-        log.debug("*************** test ReadInfoboxRequest for two infoboxes");
-        List<STALRequest> requests = new ArrayList<STALRequest>();
-        InfoboxReadRequest r1 = new InfoboxReadRequest();
-        r1.setInfoboxIdentifier("infobox1");
-        requests.add(r1);
-        InfoboxReadRequest r2 = new InfoboxReadRequest();
-        r2.setInfoboxIdentifier("infobox2");
-        requests.add(r2);
-
-        BindingProcessorSimulator bp = new BindingProcessorSimulator();
-        bp.setRequests(Collections.singletonList(requests));
-
-        new Thread(new ServiceSimulator(), "STALService1").start();
-        new Thread(bp, "BindingProcessor").start();
-        new Thread(new ServiceSimulator(), "STALService2").start();
-
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException ex) {
-            log.error("interrupted: " + ex.getMessage());
-        }
-    }
-
-    @Test
-    public void testSign() {
-        log.debug("**************** test SignRequest");
-        List<STALRequest> requests = new ArrayList<STALRequest>();
-        SignRequest r1 = new SignRequest();
-        r1.setKeyIdentifier("keybox1");
-        r1.setSignedInfo("1234".getBytes());
-        HashDataInput hdi = new HashDataInput() {
-
-            @Override
-            public String getReferenceId() {
-                return "refId1234";
-            }
-
-            @Override
-            public String getMimeType() {
-                return "text/plain";
-            }
-
-            @Override
-            public InputStream getHashDataInput() {
-                return new ByteArrayInputStream("hashdatainput1234".getBytes());
-            }
-            @Override
-            public String getEncoding() {
-              return "UTF-8";
-            }
-
-
-            @Override
-            public String getFilename() {
-                return "file.txt";
-            }
-        };
-        r1.setHashDataInput(Collections.singletonList(hdi));
-        requests.add(r1);
-
-        BindingProcessorSimulator bp = new BindingProcessorSimulator();
-        bp.setRequests(Collections.singletonList(requests));
-
-        new Thread(bp, "BindingProcessor").start();
-//        new Thread(bp2, "BindingProcessor2").start();
-        new Thread(new ServiceSimulator(), "STALService").start();
-        new Thread(new ZombieServiceSimulator(), "STALServiceZombie").start();
-        
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException ex) {
-            log.error("interrupted: " + ex.getMessage());
-        }
-    }
-
-    @Ignore
-    public void testResponseTimeout() {
-        log.debug("**************** test SignRequest with responses timeout");
-        List<STALRequest> requests = new ArrayList<STALRequest>();
-        SignRequest r1 = new SignRequest();
-        r1.setKeyIdentifier("keybox1");
-        r1.setSignedInfo("1234".getBytes());
-        HashDataInput hdi = new HashDataInput() {
-
-            @Override
-            public String getReferenceId() {
-                return "refId1234";
-            }
-
-            @Override
-            public String getMimeType() {
-                return "text/plain";
-            }
-
-            @Override
-            public InputStream getHashDataInput() {
-                return new ByteArrayInputStream("hashdatainput1234".getBytes());
-            }
-            @Override
-            public String getEncoding() {
-              return "UTF-8";
-            }
-
-            @Override
-            public String getFilename() {
-                return "file.txt";
-            }
-        };
-        r1.setHashDataInput(Collections.singletonList(hdi));
-        requests.add(r1);
-
-        BindingProcessorSimulator bp = new BindingProcessorSimulator();
-        bp.setRequests(Collections.singletonList(requests));
-
-        new Thread(bp, "BindingProcessor").start();
-        new Thread(new TimeoutServiceSimulator(), "STALService").start();
-
-        try {
-            Thread.sleep(STALRequestBroker.DEFAULT_TIMEOUT_MS + 1);
-        } catch (InterruptedException ex) {
-            log.error("interrupted: " + ex.getMessage());
-        }
-    }
-
-    @Ignore
-    public void testRequestTimeout() {
-        log.debug("**************** test requests timeout");
-        TimeoutBindingProcessorSimulator bp = new TimeoutBindingProcessorSimulator();
-
-        new Thread(bp, "BindingProcessor").start();
-        new Thread(new ServiceSimulator(), "STALService").start();
-
-        try {
-            Thread.sleep(STALRequestBroker.DEFAULT_TIMEOUT_MS + 1);
-        } catch (InterruptedException ex) {
-            log.error("interrupted: " + ex.getMessage());
-        }
-    }
-
-    @Ignore
-    public void testMultipleServices() {
-        log.debug("**************** test multiple SignRequests");
-        List<STALRequest> requests = new ArrayList<STALRequest>();
-        SignRequest r1 = new SignRequest();
-        r1.setKeyIdentifier("keybox1");
-        r1.setSignedInfo("1234".getBytes());
-        HashDataInput hdi = new HashDataInput() {
-
-            @Override
-            public String getReferenceId() {
-                return "refId1234";
-            }
-
-            @Override
-            public String getMimeType() {
-                return "text/plain";
-            }
-
-            @Override
-            public InputStream getHashDataInput() {
-                return new ByteArrayInputStream("hashdatainput1234".getBytes());
-            }
-            @Override
-            public String getEncoding() {
-              return "UTF-8";
-            }
-
-            @Override
-            public String getFilename() {
-                return "file.txt";
-            }
-        };
-        r1.setHashDataInput(Collections.singletonList(hdi));
-        requests.add(r1);
-
-        List<STALRequest> requests2 = new ArrayList<STALRequest>();
-        SignRequest r2 = new SignRequest();
-        r2.setKeyIdentifier("keybox2");
-        r2.setSignedInfo("6789".getBytes());
-        HashDataInput hdi2 = new HashDataInput() {
-
-            @Override
-            public String getReferenceId() {
-                return "refId6789";
-            }
-
-            @Override
-            public String getMimeType() {
-                return "text/xml";
-            }
-
-            @Override
-            public InputStream getHashDataInput() {
-                return new ByteArrayInputStream("<xml>hashdatainput6789</xml>".getBytes());
-            }
-            @Override
-            public String getEncoding() {
-              return "UTF-8";
-            }
-
-            @Override
-            public String getFilename() {
-                return "file.xml";
-            }
-        };
-        r2.setHashDataInput(Collections.singletonList(hdi2));
-        requests2.add(r2);
-
-        BindingProcessorSimulator bp = new BindingProcessorSimulator();
-        List<List<STALRequest>> requestList = new ArrayList<List<STALRequest>>();
-        requestList.add(requests);
-        requestList.add(requests2);
-        bp.setRequests(requestList);
-
-        new Thread(bp, "BindingProcessor").start();
-//        new Thread(bp2, "BindingProcessor2").start();
-        new Thread(new ServiceSimulator(), "STALService1").start();
-        new Thread(new ServiceSimulator(), "STALService2").start();
-
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException ex) {
-            log.error("interrupted: " + ex.getMessage());
-        }
-    }
-
-    class ZombieServiceSimulator implements Runnable {
-    
-        @Override
-        public void run() {
-            try {
-              ObjectFactory of= new ObjectFactory();
-
-                log.debug("calling stal.nextRequest(oldResponse)");
-                InfoboxReadResponseType oldResp = of.createInfoboxReadResponseType();
-                ArrayList<JAXBElement<? extends ResponseType>> oldResponses = new ArrayList<JAXBElement<? extends ResponseType>>();
-                oldResponses.add(of.createGetNextRequestTypeInfoboxReadResponse(oldResp));
-
-                List<JAXBElement<? extends RequestType>> requests = stal.nextRequest(oldResponses);
-                log.debug("got " + requests.size() + " requests. processing...");
-                Thread.sleep(1);
-                List<JAXBElement<? extends ResponseType>> responses = new ArrayList<JAXBElement<? extends ResponseType>>();
-                for (JAXBElement<? extends RequestType> requestElt : requests) {
-                  RequestType request = requestElt.getValue();
-                    if (request instanceof InfoboxReadRequestType) {
-                      log.debug("received UNEXPECTED READINFOBOX request");
-                      
-                        InfoboxReadResponseType r = of.createInfoboxReadResponseType();
-                        r.setInfoboxValue("dummyInfobox".getBytes());
-                        responses.add(of.createGetNextRequestTypeInfoboxReadResponse(r));
-                    } else if (request instanceof SignRequestType) {
-
-                      log.debug("received UNEXPECTED SIGN request");
-                      
-                        log.debug("calling stal.getCurrentHashDataInputCallback");
-                        List<HashDataInput> hdis = stal.getHashDataInput();
-                        assertNotNull(hdis);
-                        assertEquals(hdis.size(), 1);
-                        HashDataInput hdi = hdis.get(0);// cb.getHashDataInput("1234");
-                        InputStream hd = hdi.getHashDataInput();
-                        byte[] data = new byte[hd.available()];
-                        hd.read(data);
-                        log.debug("got HashDataInput " + new String(data));
-
-
-                        SignResponseType r = of.createSignResponseType();
-                        r.setSignatureValue("dummySignature".getBytes());
-                        responses.add(of.createGetNextRequestTypeSignResponse(r));
-                    } else if (request instanceof QuitRequestType) {
-                        log.debug("received EXPECTED QUIT request");
-                        return;
-                    }
-                }
-
-//                if (requests.size() > 0) {
-//                    log.debug("calling stal.setResponse with " + requests.size() + " responses");
-//                    stal.setResponse(responses);
-//                }
-                log.debug("calling stal.nextRequest with " + responses.size() + " responses");
-                requests = stal.nextRequest(responses);
-                for (JAXBElement<? extends RequestType> requestElt : requests) {
-                  RequestType request = requestElt.getValue();
-                    if (request instanceof QuitRequestType) {
-                        log.debug("got QUIT request");
-                    } else {
-                        log.debug("expected QUIT request, got " + request.getClass().getName());
-                    }
-                }
-            } catch (IOException ex) {
-                log.error(ex.getMessage());
-            } catch (InterruptedException ex) {
-                log.error(ex.getMessage());
-            }
-        }
-      
-    }
-    
-    class ServiceSimulator implements Runnable {
-
-        @Override
-        public void run() {
-            try {
-              ObjectFactory of = new ObjectFactory();
-                // first call w/ empty response list
-                log.debug("calling stal.nextRequest");
-                List<JAXBElement<? extends RequestType>> requests = stal.nextRequest(null); //new ArrayList<ResponseType>());
-                log.debug("got " + requests.size() + " requests. processing...");
-                Thread.sleep(1);
-                List<JAXBElement<? extends ResponseType>> responses = new ArrayList<JAXBElement<? extends ResponseType>>();
-                for (JAXBElement<? extends RequestType> requestElt : requests) {
-                  RequestType request = requestElt.getValue();
-                    if (request instanceof InfoboxReadRequestType) {
-                        InfoboxReadResponseType r = of.createInfoboxReadResponseType();
-                        r.setInfoboxValue("dummyInfobox".getBytes());
-                        responses.add(of.createGetNextRequestTypeInfoboxReadResponse(r));
-                    } else if (request instanceof SignRequestType) {
-
-                        log.debug("calling stal.getCurrentHashDataInputCallback");
-                        List<HashDataInput> hdis = stal.getHashDataInput();
-                        assertNotNull(hdis);
-                        assertEquals(hdis.size(), 1);
-                        HashDataInput hdi = hdis.get(0);// cb.getHashDataInput("1234");
-                        InputStream hd = hdi.getHashDataInput();
-                        byte[] data = new byte[hd.available()];
-                        hd.read(data);
-                        log.debug("got HashDataInput " + new String(data));
-
-
-                        SignResponseType r = of.createSignResponseType();
-                        r.setSignatureValue("dummySignature".getBytes());
-                        responses.add(of.createGetNextRequestTypeSignResponse(r));
-                    } else if (request instanceof QuitRequestType) {
-                        log.debug("received UNEXPECTED QUIT request");
-                        return;
-                    }
-                }
-
-//                if (requests.size() > 0) {
-//                    log.debug("calling stal.setResponse with " + requests.size() + " responses");
-//                    stal.setResponse(responses);
-//                }
-                log.debug("calling stal.nextRequest with " + responses.size() + " responses");
-                requests = stal.nextRequest(responses);
-                for (JAXBElement<? extends RequestType> requestElt : requests) {
-                  RequestType request = requestElt.getValue();
-                    if (request instanceof QuitRequestType) {
-                        log.debug("got QUIT request");
-                    } else {
-                        log.debug("expected QUIT request, got " + request.getClass().getName());
-                    }
-                }
-            } catch (IOException ex) {
-                log.error(ex.getMessage());
-            } catch (InterruptedException ex) {
-                log.error(ex.getMessage());
-            }
-        }
-    }
-
-    class TimeoutServiceSimulator implements Runnable {
-
-        @Override
-        public void run() {
-            try {
-                // first call w/ empty response list
-                log.debug("calling stal.nextRequest");
-                List<JAXBElement<? extends RequestType>> requests = stal.nextRequest(null); //new ArrayList<ResponseType>());
-                log.debug("got " + requests.size() + " requests. processing...");
-                Thread.sleep(1);
-                for (JAXBElement<? extends RequestType> requestElt : requests) {
-                  RequestType request = requestElt.getValue();
-//                    if (request instanceof InfoboxReadRequest) {
-                    if (request instanceof SignRequestType) {
-                        log.debug("calling stal.getCurrentHashDataInputCallback");
-                        List<HashDataInput> hdis = stal.getHashDataInput();
-                        assertNotNull(hdis);
-                        assertEquals(hdis.size(), 1);
-                        HashDataInput hdi = hdis.get(0);// cb.getHashDataInput("1234");
-                        InputStream hd = hdi.getHashDataInput();
-                        byte[] data = new byte[hd.available()];
-                        hd.read(data);
-                        log.debug("got HashDataInput " + new String(data));
-                    } else if (request instanceof QuitRequestType) {
-                        log.debug("received UNEXPECTED QUIT requests");
-                        return;
-                    }
-                }
-                log.debug("simulating timeout ...");
-            } catch (IOException ex) {
-                log.error(ex.getMessage());
-            } catch (InterruptedException ex) {
-                log.error(ex.getMessage());
-            }
-        }
-    }
-
-    class BindingProcessorSimulator implements Runnable {
-
-        List<List<STALRequest>> requestsLists;
-
-        public void setRequests(List<List<STALRequest>> requests) {
-            this.requestsLists = requests;
-        }
-
-        @Override
-        public void run() {
-
-            //simulate SLCommand execution
-            for (List<STALRequest> requests : requestsLists) {
-                execSLCommand(requests);
-
-                log.debug("SLCommand finished, calling stal.handleReqeusts(QUIT)");
-                stal.handleRequest(Collections.singletonList((STALRequest) new QuitRequest()));
-                log.debug("QUIT returned (waiting for applet reload)");
-            }
-
-        }
-
-        public void execSLCommand(List<STALRequest> requests) {
-            int numReq = requests.size();
-            log.debug("SLCommand calling stal.handleRequests " + numReq + " requests");
-            List<STALResponse> responses = stal.handleRequest(requests);
-            assertEquals(numReq, responses.size());
-            for (int i = 0; i < numReq; i++) {
-                STALRequest request = requests.get(i);
-                STALResponse response = responses.get(i);
-
-                if (response instanceof ErrorResponse) {
-                    log.warn("SLCommand received unexpected error response from STAL: " + ((ErrorResponse) response).getErrorCode());
-                } else if (request instanceof InfoboxReadRequest) {
-                    assertTrue(response instanceof InfoboxReadResponse);
-                    String infobox = new String(((InfoboxReadResponse) response).getInfoboxValue());
-                    log.debug("SLCommand received expected InfoboxReadResponse from STAL: " + infobox);
-                } else if (request instanceof SignRequest) {
-                    assertTrue(response instanceof SignResponse);
-                    String signVal = new String(((SignResponse) response).getSignatureValue());
-                    log.debug("SLCommand received expected SignResponse from STAL: " + signVal);
-                } else {
-                    log.error("***** RequestType: " + request.getClass() + " TODO");
-                }
-            //TODO
-            }
-
-        }
-    }
-
-    class TimeoutBindingProcessorSimulator implements Runnable {
-
-        @Override
-        public void run() {
-
-            //simulate SLCommand execution
-            log.debug("simulating timeout ...");
-        }
-    }
-}
diff --git a/mocca-1.2.11/BKUOnline/src/test/resources/appletTest.html b/mocca-1.2.11/BKUOnline/src/test/resources/appletTest.html
deleted file mode 100644
index 71f09a93..00000000
--- a/mocca-1.2.11/BKUOnline/src/test/resources/appletTest.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-  Copyright 2008 Federal Chancellery Austria and
-  Graz University of Technology
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<html>
-  <body>
-    <center>
-      <applet code="at.gv.egiz.bku.online.applet.BKUApplet.class"
-              archive="../BKUOnline-1.0-SNAPSHOT/applet/BKUApplet-1.0-SNAPSHOT.jar , ../BKUOnline-1.0-SNAPSHOT/applet/commons-logging-1.1.1.jar , ../BKUOnline-1.0-SNAPSHOT/applet/iaik_jce_me4se-3.04.jar"
-              width=380 height=160>
-              <param name="WSDL_URL" value="http://localhost:3495/BKUOnline-1.0-SNAPSHOT/stal?wsdl"/>
-              <param name="SessionId" value="TestSession"/>
-              <param name="redirectURL" value="http://localhost:3495/BKUOnline-1.0-SNAPSHOT/bkuResult"/>
-      </applet>
-    </center>
-  </body>
-</html>
\ No newline at end of file
diff --git a/mocca-1.2.11/BKUOnline/src/test/resources/applicationContext.xml b/mocca-1.2.11/BKUOnline/src/test/resources/applicationContext.xml
deleted file mode 100644
index 5f2487bf..00000000
--- a/mocca-1.2.11/BKUOnline/src/test/resources/applicationContext.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-	<!--

-		Copyright 2008 Federal Chancellery Austria and Graz University of

-		Technology Licensed under the Apache License, Version 2.0 (the

-		"License"); you may not use this file except in compliance with the

-		License. You may obtain a copy of the License at

-		http://www.apache.org/licenses/LICENSE-2.0 Unless required by

-		applicable law or agreed to in writing, software distributed under the

-		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR

-		CONDITIONS OF ANY KIND, either express or implied. See the License for

-		the specific language governing permissions and limitations under the

-		License.

-	-->
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">

-

-	<bean id="STALFactory" class="at.gv.egiz.stal.service.impl.RequestBrokerSTALFactory"

-		scope="singleton" />

-

-	<bean id="accessController" class="at.gv.egiz.bku.online.accesscontroller.SpringSecurityManager"

-		scope="singleton" init-method="init">

-		<property name="config" ref="configurator"/>

-		</bean>

-

-	<bean id="commandInvoker" class="at.gv.egiz.bku.binding.SLCommandInvokerImpl">

-		<property name="securityManager" ref="accessController" />

-	</bean>

-

-	<bean id="bindingProcessorManager" class="at.gv.egiz.bku.binding.BindingProcessorManagerImpl"

-		scope="singleton">

-		<constructor-arg ref="STALFactory"></constructor-arg>

-		<constructor-arg ref="commandInvoker"></constructor-arg>

-	</bean>

-

-	<bean

-		class="org.springframework.web.context.support.ServletContextAttributeExporter">

-		<property name="attributes">

-			<map>

-				<entry key="bindingProcessorManager">

-					<ref bean="bindingProcessorManager" />

-				</entry>

-			</map>

-		</property>

-	</bean>

-

-	<!-- Configure Configuration -->

-	<bean id="certValidator" class="at.gv.egiz.bku.conf.CertValidatorImpl"></bean>

-	<bean id="configurator" class="at.gv.egiz.bku.online.conf.SpringConfigurator"

-		scope="singleton" init-method="configure">

-		<property name="resource" value="classpath:at/gv/egiz/bku/online/conf/defaultConf.properties"/>

-		<property name="certValidator" ref="certValidator"></property>

-	</bean>

-

-</beans>
\ No newline at end of file
diff --git a/mocca-1.2.11/BKUOnline/src/test/resources/commons-logging.properties b/mocca-1.2.11/BKUOnline/src/test/resources/commons-logging.properties
deleted file mode 100644
index 0d497b1b..00000000
--- a/mocca-1.2.11/BKUOnline/src/test/resources/commons-logging.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2008 Federal Chancellery Austria and
-# Graz University of Technology
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger
diff --git a/mocca-1.2.11/BKUOnline/src/test/resources/log4j.properties b/mocca-1.2.11/BKUOnline/src/test/resources/log4j.properties
deleted file mode 100644
index b30aa40a..00000000
--- a/mocca-1.2.11/BKUOnline/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2008 Federal Chancellery Austria and
-# Graz University of Technology
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-#log4j.rootLogger=INFO, STDOUT, file
-log4j.rootLogger=DEBUG, STDOUT
-log4j.logger.at.gv.egiz.bku.slcommands=TRACE, STDOUT
-log4j.logger.at.gv.egiz.bku.binding=TRACE, STDOUT
-#log4j.logger.at.gv = INFO
-
-
-# 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} | %20c |  %10t | %m%n
-#log4j.appender.STDOUT.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
-log4j.appender.STDOUT.layout.ConversionPattern=%-5p | %t | %c %x - %m%n