From 7625168308b648dab99db5c99c9de09b173ed05c Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 18 Sep 2013 10:05:01 +0200
Subject: change to 1.9.96-snapshot

--set SL-Version to hardcoded version 1.2
--add "RemoveBPK form AuthBlock" feature
--set UTC time as default (SAML1)
--add PVP2 Attributes:
  ++ AuthBlock
  ++ Certificate
  ++ BASEID
  ++ BASEID-TYPE
  ++BKUURL

Bugfix:
-- NullPointerException: GetMISSessionIDServlet.java
-- Check if it is empty: MOAMetadataProvider.java
---
 .../src/main/resources/config/moaid_config_2.0.xsd   | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'id/server/moa-id-commons/src/main/resources/config')

diff --git a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
index 9f825d4aa..701994d1f 100644
--- a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
+++ b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
@@ -18,6 +18,7 @@
 				<xsd:attribute name="friendlyName" type="xsd:string" use="optional"/>
 				<xsd:attribute name="target" type="xsd:string" use="optional"/>
 				<xsd:attribute name="targetFriendlyName" type="xsd:string" use="optional"/>
+				<xsd:attribute name="removeBPKFromAuthBlock" type="xsd:boolean" use="optional" default="false"/>
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
@@ -497,6 +498,7 @@
 	<xsd:complexType name="OnlineApplicationType">
 		<xsd:sequence>
 			<xsd:element name="isActive" type="xsd:boolean" default="false" minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="isAdminRequired" type="xsd:boolean" default="false" minOccurs="0" maxOccurs="1"/>
 			<xsd:element name="AuthComponent_OA" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>enthält Parameter über die OA, die die
@@ -537,16 +539,6 @@
 						<xsd:element ref="OA_SAML1" minOccurs="0"/>
 						<xsd:element ref="OA_PVP2" minOccurs="0"/>
 					</xsd:sequence>
-					<xsd:attribute name="slVersion" use="optional" default="1.1">
-						<xsd:simpleType>
-							<xsd:restriction base="xsd:string">
-								<xsd:enumeration value="1.1"/>
-								<xsd:enumeration value="1.2"/>
-							</xsd:restriction>
-						</xsd:simpleType>
-					</xsd:attribute>
-					<xsd:attribute name="useIFrame" type="xsd:boolean" default="false"/>
-					<xsd:attribute name="useUTC" type="xsd:boolean" default="true"/>
 					<!--xsd:element ref="pr:AbstractSimpleIdentification" minOccurs="0" 
 						maxOccurs="1"/ -->
 				</xsd:complexType>
@@ -936,15 +928,19 @@
 	<xsd:complexType name="UserDatabase">
 		<xsd:sequence>
 			<xsd:element name="bpk" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-			<xsd:element name="familyname" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-			<xsd:element name="givenname" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="familyname" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+			<xsd:element name="givenname" type="xsd:string" minOccurs="0" maxOccurs="1"/>
 			<xsd:element name="institut" type="xsd:string" minOccurs="1" maxOccurs="1"/>
 			<xsd:element name="mail" type="xsd:string" minOccurs="1" maxOccurs="1"/>
 			<xsd:element name="phone" type="xsd:string" minOccurs="1" maxOccurs="1"/>
 			<xsd:element name="username" type="xsd:string" minOccurs="1" maxOccurs="1"/>
 			<xsd:element name="password" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="userRequestTokken" type="xsd:string" minOccurs="0" maxOccurs="1"/>
 			<xsd:element name="isActive" type="xsd:boolean" default="true" minOccurs="1" maxOccurs="1"/>
 			<xsd:element name="isAdmin" type="xsd:boolean" default="true" minOccurs="1" maxOccurs="1"/>
+			<xsd:element name="isUserRequest" type="xsd:boolean" default="false" minOccurs="0" maxOccurs="1"/>
+			<xsd:element name="isUsernamePasswordAllowed" type="xsd:boolean" default="true" minOccurs="0" maxOccurs="1"/>
+			<xsd:element name="isMandateUser" type="xsd:boolean" default="false" minOccurs="0" maxOccurs="1"/>
 			<xsd:element name="lastLogin" type="xsd:date" minOccurs="1" maxOccurs="1"/>
 			<xsd:element name="OnlineApplication" type="OnlineApplication" minOccurs="0" maxOccurs="unbounded"/>
 		</xsd:sequence>
-- 
cgit v1.2.3