From cc034b2b229c3ac6cdb65a703c80658e9dd8716c Mon Sep 17 00:00:00 2001
From: "harald.bratko" <harald.bratko@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Mon, 20 Mar 2006 11:47:45 +0000
Subject: *** empty log message ***

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@670 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id.server/doc/MOA-ID-Configuration-1.2.xsd               |  9 +++++++++
 id.server/doc/MOA-ID-Configuration-1.3.xsd               | 16 +++++++++++++++-
 .../gv/egovernment/moa/id/auth/AuthenticationServer.java |  3 +--
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/id.server/doc/MOA-ID-Configuration-1.2.xsd b/id.server/doc/MOA-ID-Configuration-1.2.xsd
index c0d63542d..4b018db64 100644
--- a/id.server/doc/MOA-ID-Configuration-1.2.xsd
+++ b/id.server/doc/MOA-ID-Configuration-1.2.xsd
@@ -7,6 +7,15 @@
 		<xsd:complexType>
 			<xsd:sequence>
 				<xsd:element name="LoginType" type="LoginType" default="stateful"/>
+				<xsd:element name="Binding" minOccurs="0" maxOccurs="1">
+				<xsd:simpleType>
+					<xsd:restriction base="xsd:string">
+						<xsd:enumeration value="full"/>
+						<xsd:enumeration value="userName"/>
+						<xsd:enumeration value="none"/>
+					</xsd:restriction>
+				</xsd:simpleType>
+				</xsd:element>
 				<xsd:choice>
 					<xsd:element ref="ParamAuth"/>
 					<xsd:element ref="BasicAuth"/>
diff --git a/id.server/doc/MOA-ID-Configuration-1.3.xsd b/id.server/doc/MOA-ID-Configuration-1.3.xsd
index b387083d7..66c6e1832 100644
--- a/id.server/doc/MOA-ID-Configuration-1.3.xsd
+++ b/id.server/doc/MOA-ID-Configuration-1.3.xsd
@@ -3,7 +3,7 @@
 <xsd:schema targetNamespace="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1.1">
 	<xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
 	<xsd:import namespace="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" schemaLocation="http://www.buergerkarte.at/konzept/securitylayer/spezifikation/20020831/core/Core.20020225.xsd"/>
-	<xsd:import namespace="http://reference.e-government.gv.at/namespace/persondata/20020228#" schemaLocation="file:///C:/misc/xml/moa/schema/pd20_final/schema/PersonData_20_en_Test.xsd"/>
+	<xsd:import namespace="http://reference.e-government.gv.at/namespace/persondata/20020228#" schemaLocation="PersonData_20_en_moaWID.xsd"/>
 	<xsd:element name="Configuration">
 		<xsd:complexType>
 			<xsd:sequence>
@@ -204,6 +204,7 @@
 					<xsd:attribute name="BKUSelectionAlternative" type="BKUSelectionType" use="optional" default="HTMLComplete"/>
 				</xsd:complexType>
 			</xsd:element>
+			<xsd:element name="Templates" type="TemplatesType" minOccurs="0" maxOccurs="1" />
 			<xsd:element name="SecurityLayer">
 				<xsd:annotation>
 					<xsd:documentation>enthält Parameter für die Kommunikation mit dem 
@@ -285,6 +286,18 @@
 		</xsd:annotation>
 		<xsd:attribute name="filename" type="xsd:anyURI" use="required"/>
 	</xsd:complexType>
+	<xsd:complexType name="TemplatesType">
+		<xsd:sequence>
+			<xsd:element name="BKUSelectionTemplate" type="TemplateType" minOccurs="0" maxOccurs="1"/>
+			<xsd:element name="Template" type="TemplateType" minOccurs="0" maxOccurs="1"/>
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:complexType name="TemplateType">
+		<xsd:annotation>
+			<xsd:documentation>das Attribut URL spezifiziert die Lage des Templates</xsd:documentation>
+		</xsd:annotation>
+		<xsd:attribute name="URL" type="xsd:anyURI" use="required"/>
+	</xsd:complexType>
 	<xsd:complexType name="ProxyComponentType"/>
 	<xsd:complexType name="OnlineApplicationType">
 		<xsd:sequence>
@@ -321,6 +334,7 @@
 								</xsd:choice>
 							</xsd:complexType>
 						</xsd:element>
+						<xsd:element name="Templates" type="TemplatesType" minOccurs="0" maxOccurs="1" />
 						<xsd:element name="TransformsInfo" type="TransformsInfoType" minOccurs="0" maxOccurs="unbounded"/>
 					</xsd:sequence>
 					<xsd:attribute name="slVersion" use="optional" default="1.1">
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
index c0fcc6a68..17370ea6b 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
@@ -593,8 +593,7 @@ public class AuthenticationServer implements MOAIDAuthConstants {
     if (provideStammzahl) {
       authData.setIdentificationValue(identityLink.getIdentificationValue());
     }
-    String prPerson = new PersonDataBuilder().build(identityLink, provideStammzahl);
-        
+    String prPerson = new PersonDataBuilder().build(identityLink, provideStammzahl);        
     try {     
       String signerCertificateBase64 = "";
       if (oaParam.getProvideCertifcate()) {
-- 
cgit v1.2.3