From 42c8940c7b813744933d261e4c414f17762062cd Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Thu, 20 Feb 2014 16:57:14 +0100
Subject: ap plugins are persisted now

---
 .../src/main/resources/config/moaid_config_2.0.xsd          | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(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 33ad5c990..ea78918b6 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
@@ -49,7 +49,7 @@
 			<xsd:extension base="xsd:string"/>
 		</xsd:simpleContent>
 	</xsd:complexType>
-	<xsd:element name="AbstractSimpleIdentification" type="StorkAttribute">
+	<xsd:element name="AbstractSimpleIdentification" type="AttributeProviderPlugin">
 		<xsd:annotation>
 			<xsd:documentation>possibility to include common austrian primary
 				keys in human readable way, english translation not available
@@ -933,6 +933,8 @@
 					type="xsd:boolean" />
 				<xsd:element ref="Qaa" maxOccurs="1" minOccurs="0"></xsd:element>
 				<xsd:element ref="OAAttributes" maxOccurs="unbounded" minOccurs="0"></xsd:element>
+				<xsd:element name="VidpEnabled" type="xsd:boolean"></xsd:element>
+				<xsd:element ref="AttributeProviders" maxOccurs="unbounded" minOccurs="0"></xsd:element>
 			</xsd:sequence>
    		</xsd:complexType>
 	</xsd:element>
@@ -1010,4 +1012,13 @@
     </xsd:complexType>
 
     <xsd:element name="OAAttributes" type="OAStorkAttribute"></xsd:element>
+
+    <xsd:complexType name="AttributeProviderPlugin">
+    	<xsd:sequence>
+    		<xsd:element name="name" type="xsd:string"></xsd:element>
+    		<xsd:element name="url" type="xsd:anyURI"></xsd:element>
+    	</xsd:sequence>
+    </xsd:complexType>
+    
+    <xsd:element name="AttributeProviders" type="AttributeProviderPlugin"></xsd:element>
 </xsd:schema>
-- 
cgit v1.2.3


From 1ba3c2042e0c4da08af39db6172ff1206dfece36 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Wed, 5 Mar 2014 10:22:46 +0100
Subject: ap plugins can be configured to listen to certain attributes

---
 .../moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd    | 5 +++--
 1 file changed, 3 insertions(+), 2 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 d20ec1c68..845e4fe1f 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
@@ -957,8 +957,9 @@
     		<xsd:sequence>
     			<xsd:element name="name" type="xsd:string"></xsd:element>
     			<xsd:element name="url" type="xsd:anyURI"></xsd:element>
- 		</xsd:sequence>
-	</xsd:complexType>
+    			<xsd:element name="attributes" type="xsd:string"></xsd:element>
+    		</xsd:sequence>
+    	</xsd:complexType>
     
 	<xsd:element name="AttributeProviders" type="AttributeProviderPlugin"></xsd:element>
 	<xsd:element name="Attributes" type="StorkAttribute"/>
-- 
cgit v1.2.3


From 58c8a91c173ce699b8014e4f81fa195bfa37d246 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Wed, 5 Mar 2014 19:28:25 +0100
Subject: land selection change

---
 .../moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd   | 6 ++++--
 1 file changed, 4 insertions(+), 2 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 d20ec1c68..b2c9eb58c 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
@@ -11,14 +11,16 @@
 						<xsd:restriction base="xsd:NMTOKEN">
 							<xsd:enumeration value="businessService"/>
 							<xsd:enumeration value="publicService"/>
-						</xsd:restriction>
+                            <xsd:enumeration value="storkService"/>
+                        </xsd:restriction>
 					</xsd:simpleType>
 				</xsd:attribute>
 				<xsd:attribute name="calculateHPI" type="xsd:boolean" use="optional" default="false"/>
 				<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:attribute name="storkSPTargetCountry" type="xsd:string" use="optional"/>
+                <xsd:attribute name="removeBPKFromAuthBlock" type="xsd:boolean" use="optional" default="false"/>
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
-- 
cgit v1.2.3


From 4ade7db6124eec07aebf087721d3d478f92bdaad Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Wed, 12 Mar 2014 09:59:19 +0100
Subject: added consent-checkbox to config ui

---
 .../src/main/resources/config/moaid_config_2.0.xsd          | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 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 b7e8f6ff3..936363169 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
@@ -883,11 +883,16 @@
 	<xsd:element name="OA_STORK">
 		<xsd:complexType>
 			<xsd:sequence>
-				<xsd:element name="StorkLogonEnabled" type="xsd:boolean"/>
-				<xsd:element ref="Qaa" minOccurs="0" maxOccurs="1"/>
-				<xsd:element ref="OAAttributes" minOccurs="0" maxOccurs="unbounded"/>
+				<xsd:element name="StorkLogonEnabled"
+					type="xsd:boolean" />
+				<xsd:element ref="Qaa" minOccurs="0" maxOccurs="1" />
+				<xsd:element ref="OAAttributes" minOccurs="0"
+					maxOccurs="unbounded" />
 				<xsd:element name="VidpEnabled" type="xsd:boolean"></xsd:element>
-				<xsd:element ref="AttributeProviders" maxOccurs="unbounded" minOccurs="0"></xsd:element>
+				<xsd:element ref="AttributeProviders"
+					maxOccurs="unbounded" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="requireConsent" type="xsd:boolean"></xsd:element>
 			</xsd:sequence>
 		</xsd:complexType>
 	</xsd:element>
-- 
cgit v1.2.3


From 6c9e452d5ab984c1ef221c4a2e746454aa41e014 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 14 Mar 2014 12:51:53 +0100
Subject: change PKIX chaining mode constant

---
 id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 e6705dbb8..269da4cd6 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
@@ -569,7 +569,7 @@
 	<xsd:element name="TrustProfileID" type="xsd:string"/>
 	<xsd:simpleType name="ChainingModeType">
 		<xsd:restriction base="xsd:string">
-			<xsd:enumeration value="chaining"/>
+			<xsd:enumeration value="chain"/>
 			<xsd:enumeration value="pkix"/>
 		</xsd:restriction>
 	</xsd:simpleType>
-- 
cgit v1.2.3


From 76dd4489a0b0b93ff08c7c684ca229df6f29c0cb Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 14 Mar 2014 13:39:50 +0100
Subject: Revert "change PKIX chaining mode constant"

This reverts commit 6c9e452d5ab984c1ef221c4a2e746454aa41e014.
---
 id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 269da4cd6..e6705dbb8 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
@@ -569,7 +569,7 @@
 	<xsd:element name="TrustProfileID" type="xsd:string"/>
 	<xsd:simpleType name="ChainingModeType">
 		<xsd:restriction base="xsd:string">
-			<xsd:enumeration value="chain"/>
+			<xsd:enumeration value="chaining"/>
 			<xsd:enumeration value="pkix"/>
 		</xsd:restriction>
 	</xsd:simpleType>
-- 
cgit v1.2.3


From 60ac2a89fce86eb1e8344eb22535cfdd0b9aa147 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Fri, 14 Mar 2014 18:37:56 +0100
Subject: attr

---
 id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 936363169..3a2b8cc62 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
@@ -892,7 +892,7 @@
 				<xsd:element ref="AttributeProviders"
 					maxOccurs="unbounded" minOccurs="0">
 				</xsd:element>
-				<xsd:element name="requireConsent" type="xsd:boolean"></xsd:element>
+				<xsd:element name="requireConsent" type="xsd:boolean" ></xsd:element>
 			</xsd:sequence>
 		</xsd:complexType>
 	</xsd:element>
-- 
cgit v1.2.3


From ab9c1d3b201ca110f33831133a85ea2da353e5d8 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 17 Mar 2014 11:35:59 +0100
Subject: change mandate profile configuration

---
 .../moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(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 e6705dbb8..7d84cfce7 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
@@ -506,7 +506,8 @@
 						<xsd:element name="Mandates" minOccurs="0">
 							<xsd:complexType>
 								<xsd:sequence>
-									<xsd:element name="Profiles" type="xsd:string"/>
+										<xsd:element name="Profiles" type="xsd:string"/>
+										<xsd:element name="ProfileName" type="xsd:string" minOccurs="0" maxOccurs="unbounded"></xsd:element>
 								</xsd:sequence>
 							</xsd:complexType>
 						</xsd:element>
-- 
cgit v1.2.3


From fe4cd5b18aab602ed030ea2a42b47875e85e380b Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 21 Mar 2014 14:55:51 +0100
Subject: update JaxB Binding to solve configuration update problemes -> use
 Boolean instead of boolean

---
 id/server/moa-id-commons/src/main/resources/config/bindings.xjb | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/id/server/moa-id-commons/src/main/resources/config/bindings.xjb b/id/server/moa-id-commons/src/main/resources/config/bindings.xjb
index bb063a73c..f2701bec4 100644
--- a/id/server/moa-id-commons/src/main/resources/config/bindings.xjb
+++ b/id/server/moa-id-commons/src/main/resources/config/bindings.xjb
@@ -6,7 +6,6 @@
 	<jaxb:bindings schemaLocation="moaid_config_2.0.xsd" node="/xsd:schema">
 		<jaxb:globalBindings localScoping="toplevel">
 			<jaxb:serializable/>
-			<xjc:simple/>
        <xjc:javaType  name="java.lang.Boolean" 
                       xmlType="xsd:boolean" 
                       adapter="com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter"/>
-- 
cgit v1.2.3