From b1c8641a63a67e3c64d948f9e8dce5c01e11e2dd Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 5 May 2010 15:29:01 +0000
Subject: Merged feature branch mocca-1.2.13-id@r724 back to trunk.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@725 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../egiz/bku/online/conf/accessControlConfig.xml   |  84 ------
 .../at/gv/egiz/mocca/id/idlschema/PersonData.xsd   |  57 ++++
 .../oasis-sstc-saml-schema-assertion-1.0.xsd       | 105 +++++++
 .../mocca/id/idlschema/xmldsig-core-schema.xsd     | 308 +++++++++++++++++++++
 .../at/gv/egiz/mocca/id/idlschema/xmldsig-more.xsd | 147 ++++++++++
 .../src/main/resources/commons-logging.properties  |  16 --
 BKUOnline/src/main/resources/log4j.properties      |   7 +-
 7 files changed, 621 insertions(+), 103 deletions(-)
 delete mode 100644 BKUOnline/src/main/resources/at/gv/egiz/bku/online/conf/accessControlConfig.xml
 create mode 100644 BKUOnline/src/main/resources/at/gv/egiz/mocca/id/idlschema/PersonData.xsd
 create mode 100644 BKUOnline/src/main/resources/at/gv/egiz/mocca/id/idlschema/oasis-sstc-saml-schema-assertion-1.0.xsd
 create mode 100644 BKUOnline/src/main/resources/at/gv/egiz/mocca/id/idlschema/xmldsig-core-schema.xsd
 create mode 100644 BKUOnline/src/main/resources/at/gv/egiz/mocca/id/idlschema/xmldsig-more.xsd
 delete mode 100644 BKUOnline/src/main/resources/commons-logging.properties

(limited to 'BKUOnline/src/main/resources')

diff --git a/BKUOnline/src/main/resources/at/gv/egiz/bku/online/conf/accessControlConfig.xml b/BKUOnline/src/main/resources/at/gv/egiz/bku/online/conf/accessControlConfig.xml
deleted file mode 100644
index f8d1411c..00000000
--- a/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/BKUOnline/src/main/resources/at/gv/egiz/mocca/id/idlschema/PersonData.xsd b/BKUOnline/src/main/resources/at/gv/egiz/mocca/id/idlschema/PersonData.xsd
new file mode 100644
index 00000000..3d59a2b1
--- /dev/null
+++ b/BKUOnline/src/main/resources/at/gv/egiz/mocca/id/idlschema/PersonData.xsd
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- NOTE: This is not the official person data schema! -->
+<!-- This is a special version of the person data schema to validate identity links. -->
+<xs:schema targetNamespace="http://reference.e-government.gv.at/namespace/persondata/20020228#"
+  xmlns="http://reference.e-government.gv.at/namespace/persondata/20020228#"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.0">
+  <xs:element name="Person" type="AbstractPersonType"/>
+  <xs:complexType name="AbstractPersonType" abstract="true">
+    <xs:sequence>
+      <xs:element name="Identification" type="IdentificationType" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:element name="PhysicalPerson" type="PhysicalPersonType"/>
+  <xs:complexType name="PhysicalPersonType">
+    <xs:complexContent>
+      <xs:extension base="AbstractPersonType">
+        <xs:sequence>
+          <xs:element name="Name" type="PersonNameType"/>
+          <xs:element name="DateOfBirth" type="DateOfBirthType"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="IdentificationType">
+    <xs:sequence>
+      <xs:element name="Value" type="xs:string"/>
+      <xs:element name="Type" type="xs:anyURI"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:simpleType name="DateOfBirthType">
+    <xs:union memberTypes="xs:date xs:gYearMonth xs:gYear"/>
+  </xs:simpleType>
+  <xs:complexType name="PersonNameType">
+    <xs:sequence>
+      <xs:element name="GivenName" type="xs:string"/>
+      <xs:element name="FamilyName">
+        <xs:complexType>
+          <xs:simpleContent>
+            <xs:extension base="xs:string">
+              <xs:attribute name="primary" default="undefined">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:enumeration value="true"/>
+                    <xs:enumeration value="false"/>
+                    <xs:enumeration value="undefined"/>
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:attribute>
+              <xs:attribute name="prefix" type="xs:string"/>
+            </xs:extension>
+          </xs:simpleContent>
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>
\ No newline at end of file
diff --git a/BKUOnline/src/main/resources/at/gv/egiz/mocca/id/idlschema/oasis-sstc-saml-schema-assertion-1.0.xsd b/BKUOnline/src/main/resources/at/gv/egiz/mocca/id/idlschema/oasis-sstc-saml-schema-assertion-1.0.xsd
new file mode 100644
index 00000000..5518db2f
--- /dev/null
+++ b/BKUOnline/src/main/resources/at/gv/egiz/mocca/id/idlschema/oasis-sstc-saml-schema-assertion-1.0.xsd
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XML Spy v3.5 NT (http://www.xmlspy.com) by Phill Hallam-Baker (VeriSign Inc.) -->
+<schema targetNamespace="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:ecdsa="http://www.w3.org/2001/04/xmldsig-more#" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
+        <import namespace="http://reference.e-government.gv.at/namespace/persondata/20020228#" schemaLocation="PersonData.xsd"/>
+        <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
+        <import namespace="http://www.w3.org/2001/04/xmldsig-more#" schemaLocation="xmldsig-more.xsd"/>
+        <element name="Assertion" type="saml:AssertionType"/>
+        <complexType name="AssertionType">
+                <sequence>
+                        <element ref="saml:AttributeStatement"/>
+                        <element ref="ds:Signature" minOccurs="0"/>
+                </sequence>
+                <attribute name="MajorVersion" type="integer" use="required" fixed="1"/>
+                <attribute name="MinorVersion" type="integer" use="required" fixed="0"/>
+                <attribute name="AssertionID" type="saml:IDType" use="required"/>
+                <attribute name="Issuer" type="string" use="required"/>
+                <attribute name="IssueInstant" type="dateTime" use="required"/>
+        </complexType>
+        <simpleType name="IDType">
+                <restriction base="string"/>
+        </simpleType>
+        <element name="AttributeStatement" type="saml:AttributeStatementType"/>
+        <complexType name="AttributeStatementType">
+                <complexContent>
+                        <extension base="saml:SubjectStatementAbstractType1">
+                                <sequence>
+                                        <element ref="saml:Attribute" maxOccurs="unbounded"/>
+                                </sequence>
+                        </extension>
+                </complexContent>
+        </complexType>
+        <complexType name="SubjectStatementAbstractType1" abstract="true">
+                <complexContent>
+                        <extension base="saml:StatementAbstractType">
+                                <sequence>
+                                        <element ref="saml:Subject"/>
+                                </sequence>
+                        </extension>
+                </complexContent>
+        </complexType>
+        <complexType name="StatementAbstractType" abstract="true"/>
+        <element name="Subject" type="saml:SubjectType"/>
+        <complexType name="SubjectType">
+                <choice>
+                        <sequence>
+                                <element ref="saml:NameIdentifier"/>
+                                <element ref="saml:SubjectConfirmation"/>
+                        </sequence>
+                        <element ref="saml:SubjectConfirmation"/>
+                </choice>
+        </complexType>
+        <element name="NameIdentifier" type="saml:NameIdentifierType"/>
+        <complexType name="NameIdentifierType">
+                <simpleContent>
+                        <extension base="string">
+                                <attribute name="NameQualifier" type="string" use="optional"/>
+                                <attribute name="Format" type="anyURI" use="optional"/>
+                        </extension>
+                </simpleContent>
+        </complexType>
+        <element name="SubjectConfirmation" type="saml:SubjectConfirmationType"/>
+        <complexType name="SubjectConfirmationType">
+                <sequence>
+                        <element ref="saml:ConfirmationMethod"/>
+                        <element ref="saml:SubjectConfirmationData"/>
+                </sequence>
+        </complexType>
+        <element name="SubjectConfirmationData">
+                <complexType>
+                        <sequence>
+                                <element ref="pr:Person"/>
+                        </sequence>
+                </complexType>
+        </element>
+        <element name="ConfirmationMethod">
+                <simpleType>
+                        <restriction base="anyURI">
+                                <enumeration value="urn:oasis:names:tc:SAML:1.0:cm:sender-vouches"/>
+                        </restriction>
+                </simpleType>
+        </element>
+        <element name="Attribute" type="saml:AttributeType"/>
+        <complexType name="AttributeType">
+                <complexContent>
+                        <extension base="saml:AttributeDesignatorType">
+                                <sequence>
+                                        <element ref="saml:AttributeValue" maxOccurs="unbounded"/>
+                                </sequence>
+                        </extension>
+                </complexContent>
+        </complexType>
+        <complexType name="AttributeDesignatorType">
+                <attribute name="AttributeName" type="string" use="required" fixed="CitizenPublicKey"/>
+                <attribute name="AttributeNamespace" type="anyURI" use="required" fixed="urn:publicid:gv.at:namespaces:identitylink:1.2"/>
+        </complexType>
+        <element name="AttributeValue">
+                <complexType>
+                        <choice>
+                                <element ref="ds:DSAKeyValue"/>
+                                <element ref="ds:RSAKeyValue"/>
+                                <element ref="ecdsa:ECDSAKeyValue"/>
+                        </choice>
+                </complexType>
+        </element>
+</schema>
diff --git a/BKUOnline/src/main/resources/at/gv/egiz/mocca/id/idlschema/xmldsig-core-schema.xsd b/BKUOnline/src/main/resources/at/gv/egiz/mocca/id/idlschema/xmldsig-core-schema.xsd
new file mode 100644
index 00000000..8422fdfa
--- /dev/null
+++ b/BKUOnline/src/main/resources/at/gv/egiz/mocca/id/idlschema/xmldsig-core-schema.xsd
@@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Schema for XML Signatures
+    http://www.w3.org/2000/09/xmldsig#
+    $Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $
+
+    Copyright 2001 The Internet Society and W3C (Massachusetts Institute
+    of Technology, Institut National de Recherche en Informatique et en
+    Automatique, Keio University). All Rights Reserved.
+    http://www.w3.org/Consortium/Legal/
+
+    This document is governed by the W3C Software License [1] as described
+    in the FAQ [2].
+
+    [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+    [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+-->
+
+
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+        targetNamespace="http://www.w3.org/2000/09/xmldsig#"
+        version="0.1" elementFormDefault="qualified"> 
+
+<!-- Basic Types Defined for Signatures -->
+
+<simpleType name="CryptoBinary">
+  <restriction base="base64Binary">
+  </restriction>
+</simpleType>
+
+<!-- Start Signature -->
+
+<element name="Signature" type="ds:SignatureType"/>
+<complexType name="SignatureType">
+  <sequence> 
+    <element ref="ds:SignedInfo"/> 
+    <element ref="ds:SignatureValue"/> 
+    <element ref="ds:KeyInfo" minOccurs="0"/> 
+    <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/> 
+  </sequence>  
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="SignatureValue" type="ds:SignatureValueType"/> 
+  <complexType name="SignatureValueType">
+    <simpleContent>
+      <extension base="base64Binary">
+        <attribute name="Id" type="ID" use="optional"/>
+      </extension>
+    </simpleContent>
+  </complexType>
+
+<!-- Start SignedInfo -->
+
+<element name="SignedInfo" type="ds:SignedInfoType"/>
+<complexType name="SignedInfoType">
+  <sequence> 
+    <element ref="ds:CanonicalizationMethod"/> 
+    <element ref="ds:SignatureMethod"/> 
+    <element ref="ds:Reference" maxOccurs="unbounded"/> 
+  </sequence>  
+  <attribute name="Id" type="ID" use="optional"/> 
+</complexType>
+
+  <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/> 
+  <complexType name="CanonicalizationMethodType" mixed="true">
+    <sequence>
+      <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- (0,unbounded) elements from (1,1) namespace -->
+    </sequence>
+    <attribute name="Algorithm" type="anyURI" use="required"/> 
+  </complexType>
+
+  <element name="SignatureMethod" type="ds:SignatureMethodType"/>
+  <complexType name="SignatureMethodType" mixed="true">
+    <sequence>
+      <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/>
+      <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- (0,unbounded) elements from (1,1) external namespace -->
+    </sequence>
+    <attribute name="Algorithm" type="anyURI" use="required"/> 
+  </complexType>
+
+<!-- Start Reference -->
+
+<element name="Reference" type="ds:ReferenceType"/>
+<complexType name="ReferenceType">
+  <sequence> 
+    <element ref="ds:Transforms" minOccurs="0"/> 
+    <element ref="ds:DigestMethod"/> 
+    <element ref="ds:DigestValue"/> 
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/> 
+  <attribute name="URI" type="anyURI" use="optional"/> 
+  <attribute name="Type" type="anyURI" use="optional"/> 
+</complexType>
+
+  <element name="Transforms" type="ds:TransformsType"/>
+  <complexType name="TransformsType">
+    <sequence>
+      <element ref="ds:Transform" maxOccurs="unbounded"/>  
+    </sequence>
+  </complexType>
+
+  <element name="Transform" type="ds:TransformType"/>
+  <complexType name="TransformType" mixed="true">
+    <choice minOccurs="0" maxOccurs="unbounded"> 
+      <any namespace="##other" processContents="lax"/>
+      <!-- (1,1) elements from (0,unbounded) namespaces -->
+      <element name="XPath" type="string"/> 
+    </choice>
+    <attribute name="Algorithm" type="anyURI" use="required"/> 
+  </complexType>
+
+<!-- End Reference -->
+
+<element name="DigestMethod" type="ds:DigestMethodType"/>
+<complexType name="DigestMethodType" mixed="true"> 
+  <sequence>
+    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+  </sequence>    
+  <attribute name="Algorithm" type="anyURI" use="required"/> 
+</complexType>
+
+<element name="DigestValue" type="ds:DigestValueType"/>
+<simpleType name="DigestValueType">
+  <restriction base="base64Binary"/>
+</simpleType>
+
+<!-- End SignedInfo -->
+
+<!-- Start KeyInfo -->
+
+<element name="KeyInfo" type="ds:KeyInfoType"/> 
+<complexType name="KeyInfoType" mixed="true">
+  <choice maxOccurs="unbounded">     
+    <element ref="ds:KeyName"/> 
+    <element ref="ds:KeyValue"/> 
+    <element ref="ds:RetrievalMethod"/> 
+    <element ref="ds:X509Data"/> 
+    <element ref="ds:PGPData"/> 
+    <element ref="ds:SPKIData"/>
+    <element ref="ds:MgmtData"/>
+    <any processContents="lax" namespace="##other"/>
+    <!-- (1,1) elements from (0,unbounded) namespaces -->
+  </choice>
+  <attribute name="Id" type="ID" use="optional"/> 
+</complexType>
+
+  <element name="KeyName" type="string"/>
+  <element name="MgmtData" type="string"/>
+
+  <element name="KeyValue" type="ds:KeyValueType"/> 
+  <complexType name="KeyValueType" mixed="true">
+   <choice>
+     <element ref="ds:DSAKeyValue"/>
+     <element ref="ds:RSAKeyValue"/>
+     <any namespace="##other" processContents="lax"/>
+   </choice>
+  </complexType>
+
+  <element name="RetrievalMethod" type="ds:RetrievalMethodType"/> 
+  <complexType name="RetrievalMethodType">
+    <sequence>
+      <element ref="ds:Transforms" minOccurs="0"/> 
+    </sequence>  
+    <attribute name="URI" type="anyURI"/>
+    <attribute name="Type" type="anyURI" use="optional"/>
+  </complexType>
+
+<!-- Start X509Data -->
+
+<element name="X509Data" type="ds:X509DataType"/> 
+<complexType name="X509DataType">
+  <sequence maxOccurs="unbounded">
+    <choice>
+      <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/>
+      <element name="X509SKI" type="base64Binary"/>
+      <element name="X509SubjectName" type="string"/>
+      <element name="X509Certificate" type="base64Binary"/>
+      <element name="X509CRL" type="base64Binary"/>
+      <any namespace="##other" processContents="lax"/>
+    </choice>
+  </sequence>
+</complexType>
+
+<complexType name="X509IssuerSerialType"> 
+  <sequence> 
+    <element name="X509IssuerName" type="string"/> 
+    <element name="X509SerialNumber" type="integer"/> 
+  </sequence>
+</complexType>
+
+<!-- End X509Data -->
+
+<!-- Begin PGPData -->
+
+<element name="PGPData" type="ds:PGPDataType"/> 
+<complexType name="PGPDataType"> 
+  <choice>
+    <sequence>
+      <element name="PGPKeyID" type="base64Binary"/> 
+      <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/> 
+      <any namespace="##other" processContents="lax" minOccurs="0"
+       maxOccurs="unbounded"/>
+    </sequence>
+    <sequence>
+      <element name="PGPKeyPacket" type="base64Binary"/> 
+      <any namespace="##other" processContents="lax" minOccurs="0"
+       maxOccurs="unbounded"/>
+    </sequence>
+  </choice>
+</complexType>
+
+<!-- End PGPData -->
+
+<!-- Begin SPKIData -->
+
+<element name="SPKIData" type="ds:SPKIDataType"/> 
+<complexType name="SPKIDataType">
+  <sequence maxOccurs="unbounded">
+    <element name="SPKISexp" type="base64Binary"/>
+    <any namespace="##other" processContents="lax" minOccurs="0"/>
+  </sequence>
+</complexType> 
+
+<!-- End SPKIData -->
+
+<!-- End KeyInfo -->
+
+<!-- Start Object (Manifest, SignatureProperty) -->
+
+<element name="Object" type="ds:ObjectType"/> 
+<complexType name="ObjectType" mixed="true">
+  <sequence minOccurs="0" maxOccurs="unbounded">
+    <any namespace="##any" processContents="lax"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/> 
+  <attribute name="MimeType" type="string" use="optional"/> <!-- add a grep facet -->
+  <attribute name="Encoding" type="anyURI" use="optional"/> 
+</complexType>
+
+<element name="Manifest" type="ds:ManifestType"/> 
+<complexType name="ManifestType">
+  <sequence>
+    <element ref="ds:Reference" maxOccurs="unbounded"/> 
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/> 
+</complexType>
+
+<element name="SignatureProperties" type="ds:SignaturePropertiesType"/> 
+<complexType name="SignaturePropertiesType">
+  <sequence>
+    <element ref="ds:SignatureProperty" maxOccurs="unbounded"/> 
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/> 
+</complexType>
+
+   <element name="SignatureProperty" type="ds:SignaturePropertyType"/> 
+   <complexType name="SignaturePropertyType" mixed="true">
+     <choice maxOccurs="unbounded">
+       <any namespace="##other" processContents="lax"/>
+       <!-- (1,1) elements from (1,unbounded) namespaces -->
+     </choice>
+     <attribute name="Target" type="anyURI" use="required"/> 
+     <attribute name="Id" type="ID" use="optional"/> 
+   </complexType>
+
+<!-- End Object (Manifest, SignatureProperty) -->
+
+<!-- Start Algorithm Parameters -->
+
+<simpleType name="HMACOutputLengthType">
+  <restriction base="integer"/>
+</simpleType>
+
+<!-- Start KeyValue Element-types -->
+
+<element name="DSAKeyValue" type="ds:DSAKeyValueType"/>
+<complexType name="DSAKeyValueType">
+  <sequence>
+    <sequence minOccurs="0">
+      <element name="P" type="ds:CryptoBinary"/>
+      <element name="Q" type="ds:CryptoBinary"/>
+    </sequence>
+    <element name="G" type="ds:CryptoBinary" minOccurs="0"/>
+    <element name="Y" type="ds:CryptoBinary"/>
+    <element name="J" type="ds:CryptoBinary" minOccurs="0"/>
+    <sequence minOccurs="0">
+      <element name="Seed" type="ds:CryptoBinary"/>
+      <element name="PgenCounter" type="ds:CryptoBinary"/>
+    </sequence>
+  </sequence>
+</complexType>
+
+<element name="RSAKeyValue" type="ds:RSAKeyValueType"/>
+<complexType name="RSAKeyValueType">
+  <sequence>
+    <element name="Modulus" type="ds:CryptoBinary"/> 
+    <element name="Exponent" type="ds:CryptoBinary"/> 
+  </sequence>
+</complexType> 
+
+<!-- End KeyValue Element-types -->
+
+<!-- End Signature -->
+
+</schema>
diff --git a/BKUOnline/src/main/resources/at/gv/egiz/mocca/id/idlschema/xmldsig-more.xsd b/BKUOnline/src/main/resources/at/gv/egiz/mocca/id/idlschema/xmldsig-more.xsd
new file mode 100644
index 00000000..52856ae6
--- /dev/null
+++ b/BKUOnline/src/main/resources/at/gv/egiz/mocca/id/idlschema/xmldsig-more.xsd
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+ <xs:schema 
+   targetNamespace="http://www.w3.org/2001/04/xmldsig-more#"
+   xmlns:ecdsa="http://www.w3.org/2001/04/xmldsig-more#"
+   xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+   elementFormDefault="qualified" attributeFormDefault="unqualified"
+   version="0.2">    
+
+   <!--ECDSA key value root element-->
+
+   <xs:element name="ECDSAKeyValue" type="ecdsa:ECDSAKeyValueType"/>
+   <xs:complexType name="ECDSAKeyValueType">
+     <xs:sequence>
+       <xs:element name="DomainParameters" 
+                   type="ecdsa:DomainParamsType" minOccurs="0"/>
+       <xs:element name="PublicKey" type="ecdsa:ECPointType"/>
+     </xs:sequence>
+   </xs:complexType>
+
+   <!--EC domain parameters-->
+
+   <xs:complexType name="DomainParamsType">
+     <xs:choice>
+       <xs:element name="ExplicitParams" 
+                   type="ecdsa:ExplicitParamsType"/>
+       <xs:element name="NamedCurve">
+         <xs:complexType>
+           <xs:attribute name="URN" type="xs:anyURI" use="required"/>
+         </xs:complexType>
+       </xs:element>
+     </xs:choice>
+   </xs:complexType>
+   <xs:complexType name="FieldParamsType" abstract="true"/>
+
+   <xs:complexType name="PrimeFieldParamsType">
+     <xs:complexContent>
+       <xs:extension base="ecdsa:FieldParamsType">
+         <xs:sequence>
+           <xs:element name="P" type="xs:positiveInteger"/>
+         </xs:sequence>
+       </xs:extension>
+     </xs:complexContent>
+   </xs:complexType>
+
+   <xs:complexType name="CharTwoFieldParamsType" abstract="true">
+     <xs:complexContent>
+       <xs:extension base="ecdsa:FieldParamsType">
+         <xs:sequence>
+           <xs:element name="M" type="xs:positiveInteger"/>
+         </xs:sequence>
+       </xs:extension>
+     </xs:complexContent>
+   </xs:complexType>
+   <xs:complexType name="OddCharExtensionFieldParamsType">
+     <xs:complexContent>
+       <xs:extension base="ecdsa:FieldParamsType">
+         <xs:sequence>
+           <xs:element name="M" type="xs:positiveInteger"/>
+           <xs:element name="W" type="xs:positiveInteger"/>
+         </xs:sequence>
+       </xs:extension>
+     </xs:complexContent>
+   </xs:complexType>
+   <xs:complexType name="TnBFieldParamsType">
+     <xs:complexContent>
+       <xs:extension base="ecdsa:CharTwoFieldParamsType">
+         <xs:sequence>
+           <xs:element name="K" type="xs:positiveInteger"/>
+         </xs:sequence>
+       </xs:extension>
+     </xs:complexContent>
+   </xs:complexType>
+   <xs:complexType name="PnBFieldParamsType">
+     <xs:complexContent>
+       <xs:extension base="ecdsa:CharTwoFieldParamsType">
+         <xs:sequence>
+           <xs:element name="K1" type="xs:positiveInteger"/>
+           <xs:element name="K2" type="xs:positiveInteger"/>
+           <xs:element name="K3" type="xs:positiveInteger"/>
+         </xs:sequence>
+       </xs:extension>
+     </xs:complexContent>
+   </xs:complexType>
+
+   <xs:complexType name="ExplicitParamsType">
+     <xs:sequence>
+       <xs:element name="FieldParams" type="ecdsa:FieldParamsType"/>
+       <xs:element name="CurveParams" type="ecdsa:CurveParamsType"/>
+       <xs:element name="BasePointParams" 
+                   type="ecdsa:BasePointParamsType"/>
+     </xs:sequence>
+   </xs:complexType>
+   <xs:complexType name="CurveParamsType">
+     <xs:sequence>
+       <xs:element name="A" type="ecdsa:FieldElemType"/>
+       <xs:element name="B" type="ecdsa:FieldElemType"/>
+       <xs:element name="Seed" type="xs:hexBinary" minOccurs="0"/>
+     </xs:sequence>
+   </xs:complexType>
+   <xs:complexType name="BasePointParamsType">
+     <xs:sequence>
+       <xs:element name="BasePoint" type="ecdsa:ECPointType"/>
+       <xs:element name="Order" type="xs:positiveInteger"/>
+       <xs:element name="Cofactor" type="xs:positiveInteger" 
+                   minOccurs="0"/>
+     </xs:sequence>
+   </xs:complexType>
+
+   <!--EC point-->
+
+   <xs:complexType name="ECPointType">
+     <xs:sequence minOccurs="0">
+       <xs:element name="X" type="ecdsa:FieldElemType"/>
+       <xs:element name="Y" type="ecdsa:FieldElemType"/>
+     </xs:sequence>
+   </xs:complexType>
+
+   <!--Field element-->
+
+   <xs:complexType name="FieldElemType" abstract="true"/>
+   <xs:complexType name="PrimeFieldElemType">
+     <xs:complexContent>
+       <xs:extension base="ecdsa:FieldElemType">
+         <xs:attribute name="Value" type="xs:nonNegativeInteger" 
+                       use="required"/>
+       </xs:extension>
+     </xs:complexContent>
+   </xs:complexType>
+
+   <xs:complexType name="CharTwoFieldElemType">
+     <xs:complexContent>
+       <xs:extension base="ecdsa:FieldElemType">
+         <xs:attribute name="Value" type="xs:hexBinary" 
+                       use="required"/>
+       </xs:extension>
+     </xs:complexContent>
+   </xs:complexType>
+   <xs:complexType name="OddCharExtensionFieldElemType">
+     <xs:complexContent>
+       <xs:extension base="ecdsa:FieldElemType">
+         <xs:attribute name="Value" type="xs:nonNegativeInteger" 
+                       use="required"/>
+       </xs:extension>
+     </xs:complexContent>
+   </xs:complexType>
+ </xs:schema>
\ No newline at end of file
diff --git a/BKUOnline/src/main/resources/commons-logging.properties b/BKUOnline/src/main/resources/commons-logging.properties
deleted file mode 100644
index 0d497b1b..00000000
--- a/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/BKUOnline/src/main/resources/log4j.properties b/BKUOnline/src/main/resources/log4j.properties
index d4a03fe7..e3012f35 100644
--- a/BKUOnline/src/main/resources/log4j.properties
+++ b/BKUOnline/src/main/resources/log4j.properties
@@ -14,9 +14,10 @@
 # limitations under the License.
 
 
-#log4j.rootLogger=DEBUG, STDOUT, file
-log4j.rootLogger=INFO, file
+log4j.rootLogger=INFO, STDOUT, file
+#log4j.rootLogger=DEBUG, file
 #log4j.logger.at.gv=TRACE
+log4j.logger.org.springframework=INFO
 
 
 # STDOUT appender
@@ -24,7 +25,7 @@ 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
+log4j.appender.STDOUT.layout.ConversionPattern=...%-0.6X{id} %-5p | %t | %c - %m%n
 
 # FILE appender
 log4j.appender.file=org.apache.log4j.RollingFileAppender
-- 
cgit v1.2.3