From f10baaa115823b8e0d2e6a736559467335a096df Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Tue, 10 Dec 2013 18:59:10 +0100
Subject: stork OA config persisted

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

(limited to 'id/server/moa-id-commons')

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 481f12091..7df6bad3f 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
@@ -528,7 +528,7 @@
 								</xsd:sequence>
 							</xsd:complexType>
 						</xsd:element>
-						<xsd:element ref="STORK" minOccurs="0"/>
+						<xsd:element ref="OA_STORK" minOccurs="0"/>
 						<xsd:element name="OA_SSO" minOccurs="0">
 							<xsd:complexType>
 								<xsd:sequence>
@@ -917,6 +917,13 @@
 			</xsd:sequence>
 		</xsd:complexType>
 	</xsd:element>
+    <xsd:element name="OA_STORK">
+   		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="StorkLogonEnabled" type="xsd:boolean"/>
+			</xsd:sequence>
+		</xsd:complexType>
+	</xsd:element>
 	<xsd:element name="Contact">
 		<xsd:complexType>
 			<xsd:sequence>
-- 
cgit v1.2.3


From f306cf7529f44d09a12a87f177368353fe1d3bc5 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Thu, 19 Dec 2013 12:04:10 +0100
Subject: OA qaa and attributes validated and persisted

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

(limited to 'id/server/moa-id-commons')

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 7df6bad3f..9700b0a4f 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
@@ -920,7 +920,10 @@
     <xsd:element name="OA_STORK">
    		<xsd:complexType>
 			<xsd:sequence>
-				<xsd:element name="StorkLogonEnabled" type="xsd:boolean"/>
+				<xsd:element name="StorkLogonEnabled"
+					type="xsd:boolean" />
+				<xsd:element ref="Attributes"></xsd:element>
+				<xsd:element ref="Qaa" maxOccurs="1" minOccurs="0"></xsd:element>
 			</xsd:sequence>
 		</xsd:complexType>
 	</xsd:element>
@@ -985,4 +988,8 @@
 			<xsd:element name="OnlyMandateLoginAllowed" type="xsd:boolean" default="false" minOccurs="0" maxOccurs="1"/>
 		</xsd:sequence>
 	</xsd:complexType>
+
+    <xsd:element name="Attributes" type="RequestedAttributesType"></xsd:element>
+
+    <xsd:element name="Qaa" type="QualityAuthenticationAssuranceLevelType"></xsd:element>
 </xsd:schema>
-- 
cgit v1.2.3


From 3da3836bcd77a23ca00df2bdb088e63b47cc6499 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Tue, 7 Jan 2014 15:07:32 +0100
Subject: mandatory field in global config

---
 .../src/main/resources/config/moaid_config_2.0.xsd      | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'id/server/moa-id-commons')

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 9700b0a4f..b1834fc96 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="AbstractSimpleIdentificationType">
+	<xsd:element name="AbstractSimpleIdentification" type="QualityAuthenticationAssuranceLevelType">
 		<xsd:annotation>
 			<xsd:documentation>possibility to include common austrian primary
 				keys in human readable way, english translation not available
@@ -79,12 +79,13 @@
 			<xsd:pattern value="[A-Z]{2}"/>
 		</xsd:restriction>
 	</xsd:simpleType>
-	<xsd:complexType name="RequestedAttributesType">
+	<xsd:complexType name="StorkAttribute">
 		<xsd:sequence>
-			<xsd:element name="AttributeValue" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:element name="name" type="xsd:string"></xsd:element>
+			<xsd:element name="mandatory" type="xsd:boolean"></xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>
-	<xsd:element name="RequestedAttributes" type="RequestedAttributesType"/>
+	<xsd:element name="RequestedAttributes" type="StorkAttribute"/>
 	<xsd:simpleType name="LoginType">
 		<xsd:restriction base="xsd:token">
 			<xsd:enumeration value="stateless"/>
@@ -853,7 +854,7 @@
 				</xsd:sequence>
 				<xsd:sequence>
 					<xsd:element ref="QualityAuthenticationAssuranceLevel" minOccurs="0"/>
-					<xsd:element ref="RequestedAttributes"/>
+					<xsd:element ref="RequestedAttributes" maxOccurs="unbounded" minOccurs="1"/>
 				</xsd:sequence>
 			</xsd:choice>
 		</xsd:complexType>
@@ -922,10 +923,10 @@
 			<xsd:sequence>
 				<xsd:element name="StorkLogonEnabled"
 					type="xsd:boolean" />
-				<xsd:element ref="Attributes"></xsd:element>
+				<xsd:element ref="Attributes" maxOccurs="unbounded" minOccurs="1"></xsd:element>
 				<xsd:element ref="Qaa" maxOccurs="1" minOccurs="0"></xsd:element>
 			</xsd:sequence>
-		</xsd:complexType>
+   		</xsd:complexType>
 	</xsd:element>
 	<xsd:element name="Contact">
 		<xsd:complexType>
@@ -989,7 +990,7 @@
 		</xsd:sequence>
 	</xsd:complexType>
 
-    <xsd:element name="Attributes" type="RequestedAttributesType"></xsd:element>
+    <xsd:element name="Attributes" type="StorkAttribute"></xsd:element>
 
     <xsd:element name="Qaa" type="QualityAuthenticationAssuranceLevelType"></xsd:element>
 </xsd:schema>
-- 
cgit v1.2.3


From fb6e40832df5182ae1ebd7555583caed174e8776 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Tue, 7 Jan 2014 17:25:38 +0100
Subject: oa attr configuration revisited

---
 .../src/main/resources/config/moaid_config_2.0.xsd            | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'id/server/moa-id-commons')

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 b1834fc96..6972b031c 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="QualityAuthenticationAssuranceLevelType">
+	<xsd:element name="AbstractSimpleIdentification" type="StorkAttribute">
 		<xsd:annotation>
 			<xsd:documentation>possibility to include common austrian primary
 				keys in human readable way, english translation not available
@@ -923,8 +923,8 @@
 			<xsd:sequence>
 				<xsd:element name="StorkLogonEnabled"
 					type="xsd:boolean" />
-				<xsd:element ref="Attributes" maxOccurs="unbounded" minOccurs="1"></xsd:element>
 				<xsd:element ref="Qaa" maxOccurs="1" minOccurs="0"></xsd:element>
+				<xsd:element name="Attributes" type="OAStorkAttribute" maxOccurs="unbounded" minOccurs="1"></xsd:element>
 			</xsd:sequence>
    		</xsd:complexType>
 	</xsd:element>
@@ -993,4 +993,11 @@
     <xsd:element name="Attributes" type="StorkAttribute"></xsd:element>
 
     <xsd:element name="Qaa" type="QualityAuthenticationAssuranceLevelType"></xsd:element>
+
+    <xsd:complexType name="OAStorkAttribute">
+    	<xsd:sequence>
+    		<xsd:element name="attribute" type="StorkAttribute"></xsd:element>
+    		<xsd:element name="mandatory" type="xsd:boolean"></xsd:element>
+    	</xsd:sequence>
+    </xsd:complexType>
 </xsd:schema>
-- 
cgit v1.2.3


From 7fb3ae0e4922ec76e998937b771df244574be394 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Tue, 14 Jan 2014 13:45:24 +0100
Subject: refactored stork-related database structure

---
 .../src/main/resources/config/moaid_config_2.0.xsd        | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'id/server/moa-id-commons')

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 6972b031c..3ed7c936a 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
@@ -72,8 +72,6 @@
 	</xsd:simpleType>
 	<xsd:element name="QualityAuthenticationAssuranceLevel" type="QualityAuthenticationAssuranceLevelType"/>
 	<xsd:element name="AttributeValue" type="xsd:anyType"/>
-	<xsd:complexType name="RequestedAttributeType"/>
-	<xsd:element name="RequestedAttribute" type="RequestedAttributeType"/>
 	<xsd:simpleType name="CountryCodeType">
 		<xsd:restriction base="xsd:token">
 			<xsd:pattern value="[A-Z]{2}"/>
@@ -85,7 +83,6 @@
 			<xsd:element name="mandatory" type="xsd:boolean"></xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>
-	<xsd:element name="RequestedAttributes" type="StorkAttribute"/>
 	<xsd:simpleType name="LoginType">
 		<xsd:restriction base="xsd:token">
 			<xsd:enumeration value="stateless"/>
@@ -853,8 +850,10 @@
 					<xsd:element ref="SAMLSigningParameter"/>
 				</xsd:sequence>
 				<xsd:sequence>
-					<xsd:element ref="QualityAuthenticationAssuranceLevel" minOccurs="0"/>
-					<xsd:element ref="RequestedAttributes" maxOccurs="unbounded" minOccurs="1"/>
+					<xsd:element ref="QualityAuthenticationAssuranceLevel" minOccurs="0" />
+				</xsd:sequence>
+				<xsd:sequence>
+					<xsd:element ref="Attributes" maxOccurs="unbounded" minOccurs="0" />
 				</xsd:sequence>
 			</xsd:choice>
 		</xsd:complexType>
@@ -924,7 +923,7 @@
 				<xsd:element name="StorkLogonEnabled"
 					type="xsd:boolean" />
 				<xsd:element ref="Qaa" maxOccurs="1" minOccurs="0"></xsd:element>
-				<xsd:element name="Attributes" type="OAStorkAttribute" maxOccurs="unbounded" minOccurs="1"></xsd:element>
+				<xsd:element ref="OAAttributes" maxOccurs="unbounded" minOccurs="0"></xsd:element>
 			</xsd:sequence>
    		</xsd:complexType>
 	</xsd:element>
@@ -996,8 +995,10 @@
 
     <xsd:complexType name="OAStorkAttribute">
     	<xsd:sequence>
-    		<xsd:element name="attribute" type="StorkAttribute"></xsd:element>
     		<xsd:element name="mandatory" type="xsd:boolean"></xsd:element>
+    		<xsd:element name="name" type="xsd:string"></xsd:element>
     	</xsd:sequence>
     </xsd:complexType>
+
+    <xsd:element name="OAAttributes" type="OAStorkAttribute"></xsd:element>
 </xsd:schema>
-- 
cgit v1.2.3


From ae5214a3fdafeb1a859287f96f657783187e57d6 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Wed, 15 Jan 2014 15:19:15 +0100
Subject: fixed merge issue

---
 id/server/moa-id-commons/pom.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'id/server/moa-id-commons')

diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 94726fa16..c3e850b11 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -62,7 +62,11 @@
 			<artifactId>hyperjaxb3-ejb-runtime</artifactId>
 			<version>0.5.6</version>
 		</dependency>
-		
+		<dependency>
+	<groupId>org.jvnet.hyperjaxb3</groupId>
+	<artifactId>maven-hyperjaxb3-plugin</artifactId>
+	<version>0.5.6</version>
+</dependency>
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-- 
cgit v1.2.3


From 09266016cbcb143d7b6e65d32b49b6b3d2cb53c0 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Mon, 27 Jan 2014 17:24:46 +0100
Subject: fixed issues after merge

---
 id/server/moa-id-commons/pom.xml | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

(limited to 'id/server/moa-id-commons')

diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index c3e850b11..d80e91e31 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -190,5 +190,40 @@
 				</executions>
 			</plugin>
 		</plugins>
-	</build>
+	<pluginManagement>
+		<plugins>
+			<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+			<plugin>
+				<groupId>org.eclipse.m2e</groupId>
+				<artifactId>lifecycle-mapping</artifactId>
+				<version>1.0.0</version>
+				<configuration>
+					<lifecycleMappingMetadata>
+						<pluginExecutions>
+							<pluginExecution>
+								<pluginExecutionFilter>
+									<groupId>
+										org.jvnet.hyperjaxb3
+									</groupId>
+									<artifactId>
+										maven-hyperjaxb3-plugin
+									</artifactId>
+									<versionRange>
+										[0.5.6,)
+									</versionRange>
+									<goals>
+										<goal>generate</goal>
+									</goals>
+								</pluginExecutionFilter>
+								<action>
+									<ignore></ignore>
+								</action>
+							</pluginExecution>
+						</pluginExecutions>
+					</lifecycleMappingMetadata>
+				</configuration>
+			</plugin>
+		</plugins>
+	</pluginManagement>
+  	</build>
 </project>
\ No newline at end of file
-- 
cgit v1.2.3