From 0236a88fb454682608c28f7c21716d9288b56bec Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Mon, 3 Mar 2014 09:38:27 +0100
Subject: added tweaked stork2-commons source

---
 .../src/main/resources/.svn/all-wcprops            | 11 ++++
 .../stork2-commons/src/main/resources/.svn/entries | 62 ++++++++++++++++++++++
 .../resources/.svn/text-base/log4j.xml.svn-base    | 19 +++++++
 .../stork2-commons/src/main/resources/log4j.xml    | 19 +++++++
 4 files changed, 111 insertions(+)
 create mode 100644 id/server/stork2-commons/src/main/resources/.svn/all-wcprops
 create mode 100644 id/server/stork2-commons/src/main/resources/.svn/entries
 create mode 100644 id/server/stork2-commons/src/main/resources/.svn/text-base/log4j.xml.svn-base
 create mode 100644 id/server/stork2-commons/src/main/resources/log4j.xml

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

diff --git a/id/server/stork2-commons/src/main/resources/.svn/all-wcprops b/id/server/stork2-commons/src/main/resources/.svn/all-wcprops
new file mode 100644
index 000000000..48074222b
--- /dev/null
+++ b/id/server/stork2-commons/src/main/resources/.svn/all-wcprops
@@ -0,0 +1,11 @@
+K 25
+svn:wc:ra_dav:version-url
+V 63
+/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/resources
+END
+log4j.xml
+K 25
+svn:wc:ra_dav:version-url
+V 73
+/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/resources/log4j.xml
+END
diff --git a/id/server/stork2-commons/src/main/resources/.svn/entries b/id/server/stork2-commons/src/main/resources/.svn/entries
new file mode 100644
index 000000000..4e038b836
--- /dev/null
+++ b/id/server/stork2-commons/src/main/resources/.svn/entries
@@ -0,0 +1,62 @@
+10
+
+dir
+665
+https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/resources
+https://webgate.ec.europa.eu/CITnet/svn/STORK2
+
+
+
+2013-07-25T08:54:09.995385Z
+7
+emsomavmi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+aa842e49-f825-43fc-93ba-11ee9fd5a035
+
+log4j.xml
+file
+
+
+
+
+2013-12-20T12:27:56.554475Z
+aa8c46e41a236b8c7049713b3eeecc49
+2013-07-25T08:54:09.995385Z
+7
+emsomavmi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+660
+
diff --git a/id/server/stork2-commons/src/main/resources/.svn/text-base/log4j.xml.svn-base b/id/server/stork2-commons/src/main/resources/.svn/text-base/log4j.xml.svn-base
new file mode 100644
index 000000000..8bce0bec0
--- /dev/null
+++ b/id/server/stork2-commons/src/main/resources/.svn/text-base/log4j.xml.svn-base
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+	<appender name="MainLogger" class="org.apache.log4j.DailyRollingFileAppender">
+		<param name="File" value="/opt/storklogs/stork-commons.log" />
+		<param name="DatePattern" value="'.'yyyy-MM-dd" />
+		<param name="Append" value="true" />
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%d{HH:mm:ss:SSS} - %p - %C{1} - %m%n" />
+		</layout>
+	</appender>
+
+	<root>
+		<priority value="info" />
+		<appender-ref ref="MainLogger" />
+	</root>
+
+</log4j:configuration>
diff --git a/id/server/stork2-commons/src/main/resources/log4j.xml b/id/server/stork2-commons/src/main/resources/log4j.xml
new file mode 100644
index 000000000..8bce0bec0
--- /dev/null
+++ b/id/server/stork2-commons/src/main/resources/log4j.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+	<appender name="MainLogger" class="org.apache.log4j.DailyRollingFileAppender">
+		<param name="File" value="/opt/storklogs/stork-commons.log" />
+		<param name="DatePattern" value="'.'yyyy-MM-dd" />
+		<param name="Append" value="true" />
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%d{HH:mm:ss:SSS} - %p - %C{1} - %m%n" />
+		</layout>
+	</appender>
+
+	<root>
+		<priority value="info" />
+		<appender-ref ref="MainLogger" />
+	</root>
+
+</log4j:configuration>
-- 
cgit v1.2.3


From 0b3249e37b26e029c576127654dca31bff4a5a63 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Mon, 17 Mar 2014 18:23:52 +0100
Subject: removing old samlengine and storkcommons

---
 .../src/main/resources/.svn/all-wcprops            | 11 ----
 .../stork2-commons/src/main/resources/.svn/entries | 62 ----------------------
 .../resources/.svn/text-base/log4j.xml.svn-base    | 19 -------
 .../stork2-commons/src/main/resources/log4j.xml    | 19 -------
 4 files changed, 111 deletions(-)
 delete mode 100644 id/server/stork2-commons/src/main/resources/.svn/all-wcprops
 delete mode 100644 id/server/stork2-commons/src/main/resources/.svn/entries
 delete mode 100644 id/server/stork2-commons/src/main/resources/.svn/text-base/log4j.xml.svn-base
 delete mode 100644 id/server/stork2-commons/src/main/resources/log4j.xml

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

diff --git a/id/server/stork2-commons/src/main/resources/.svn/all-wcprops b/id/server/stork2-commons/src/main/resources/.svn/all-wcprops
deleted file mode 100644
index 48074222b..000000000
--- a/id/server/stork2-commons/src/main/resources/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 63
-/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/resources
-END
-log4j.xml
-K 25
-svn:wc:ra_dav:version-url
-V 73
-/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/resources/log4j.xml
-END
diff --git a/id/server/stork2-commons/src/main/resources/.svn/entries b/id/server/stork2-commons/src/main/resources/.svn/entries
deleted file mode 100644
index 4e038b836..000000000
--- a/id/server/stork2-commons/src/main/resources/.svn/entries
+++ /dev/null
@@ -1,62 +0,0 @@
-10
-
-dir
-665
-https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/resources
-https://webgate.ec.europa.eu/CITnet/svn/STORK2
-
-
-
-2013-07-25T08:54:09.995385Z
-7
-emsomavmi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-aa842e49-f825-43fc-93ba-11ee9fd5a035
-
-log4j.xml
-file
-
-
-
-
-2013-12-20T12:27:56.554475Z
-aa8c46e41a236b8c7049713b3eeecc49
-2013-07-25T08:54:09.995385Z
-7
-emsomavmi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-660
-
diff --git a/id/server/stork2-commons/src/main/resources/.svn/text-base/log4j.xml.svn-base b/id/server/stork2-commons/src/main/resources/.svn/text-base/log4j.xml.svn-base
deleted file mode 100644
index 8bce0bec0..000000000
--- a/id/server/stork2-commons/src/main/resources/.svn/text-base/log4j.xml.svn-base
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-	<appender name="MainLogger" class="org.apache.log4j.DailyRollingFileAppender">
-		<param name="File" value="/opt/storklogs/stork-commons.log" />
-		<param name="DatePattern" value="'.'yyyy-MM-dd" />
-		<param name="Append" value="true" />
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%d{HH:mm:ss:SSS} - %p - %C{1} - %m%n" />
-		</layout>
-	</appender>
-
-	<root>
-		<priority value="info" />
-		<appender-ref ref="MainLogger" />
-	</root>
-
-</log4j:configuration>
diff --git a/id/server/stork2-commons/src/main/resources/log4j.xml b/id/server/stork2-commons/src/main/resources/log4j.xml
deleted file mode 100644
index 8bce0bec0..000000000
--- a/id/server/stork2-commons/src/main/resources/log4j.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-	<appender name="MainLogger" class="org.apache.log4j.DailyRollingFileAppender">
-		<param name="File" value="/opt/storklogs/stork-commons.log" />
-		<param name="DatePattern" value="'.'yyyy-MM-dd" />
-		<param name="Append" value="true" />
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%d{HH:mm:ss:SSS} - %p - %C{1} - %m%n" />
-		</layout>
-	</appender>
-
-	<root>
-		<priority value="info" />
-		<appender-ref ref="MainLogger" />
-	</root>
-
-</log4j:configuration>
-- 
cgit v1.2.3


From e6144cfe09bb148638911660eeb492fee7ab8079 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Thu, 20 Mar 2014 11:43:22 +0100
Subject: fixed serializable issues in stork2-commons

---
 .../src/main/resources/.svn/all-wcprops            |  17 ++
 .../stork2-commons/src/main/resources/.svn/entries |  96 +++++++
 .../text-base/StorkcomplexAttributes.xsd.svn-base  | 305 +++++++++++++++++++++
 .../resources/.svn/text-base/log4j.xml.svn-base    |  19 ++
 .../src/main/resources/StorkcomplexAttributes.xsd  | 305 +++++++++++++++++++++
 .../stork2-commons/src/main/resources/log4j.xml    |  19 ++
 6 files changed, 761 insertions(+)
 create mode 100644 id/server/stork2-commons/src/main/resources/.svn/all-wcprops
 create mode 100644 id/server/stork2-commons/src/main/resources/.svn/entries
 create mode 100644 id/server/stork2-commons/src/main/resources/.svn/text-base/StorkcomplexAttributes.xsd.svn-base
 create mode 100644 id/server/stork2-commons/src/main/resources/.svn/text-base/log4j.xml.svn-base
 create mode 100644 id/server/stork2-commons/src/main/resources/StorkcomplexAttributes.xsd
 create mode 100644 id/server/stork2-commons/src/main/resources/log4j.xml

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

diff --git a/id/server/stork2-commons/src/main/resources/.svn/all-wcprops b/id/server/stork2-commons/src/main/resources/.svn/all-wcprops
new file mode 100644
index 000000000..7f5879720
--- /dev/null
+++ b/id/server/stork2-commons/src/main/resources/.svn/all-wcprops
@@ -0,0 +1,17 @@
+K 25
+svn:wc:ra_dav:version-url
+V 64
+/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/resources
+END
+log4j.xml
+K 25
+svn:wc:ra_dav:version-url
+V 73
+/CITnet/svn/STORK2/!svn/ver/19/trunk/Commons/src/main/resources/log4j.xml
+END
+StorkcomplexAttributes.xsd
+K 25
+svn:wc:ra_dav:version-url
+V 91
+/CITnet/svn/STORK2/!svn/ver/721/trunk/Commons/src/main/resources/StorkcomplexAttributes.xsd
+END
diff --git a/id/server/stork2-commons/src/main/resources/.svn/entries b/id/server/stork2-commons/src/main/resources/.svn/entries
new file mode 100644
index 000000000..3cafa50cf
--- /dev/null
+++ b/id/server/stork2-commons/src/main/resources/.svn/entries
@@ -0,0 +1,96 @@
+10
+
+dir
+776
+https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons/src/main/resources
+https://webgate.ec.europa.eu/CITnet/svn/STORK2
+
+
+
+2014-03-04T14:10:03.192908Z
+721
+emrepisja
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+aa842e49-f825-43fc-93ba-11ee9fd5a035
+
+log4j.xml
+file
+
+
+
+
+2013-12-20T12:27:56.554475Z
+aa8c46e41a236b8c7049713b3eeecc49
+2013-07-25T08:54:09.995385Z
+7
+emsomavmi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+660
+
+StorkcomplexAttributes.xsd
+file
+
+
+
+
+2014-03-05T09:36:07.834515Z
+312be97fd22ecb2f274bf9fdebd85b29
+2014-03-04T14:10:03.192908Z
+721
+emrepisja
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+10938
+
diff --git a/id/server/stork2-commons/src/main/resources/.svn/text-base/StorkcomplexAttributes.xsd.svn-base b/id/server/stork2-commons/src/main/resources/.svn/text-base/StorkcomplexAttributes.xsd.svn-base
new file mode 100644
index 000000000..3c56bd318
--- /dev/null
+++ b/id/server/stork2-commons/src/main/resources/.svn/text-base/StorkcomplexAttributes.xsd.svn-base
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema elementFormDefault="qualified"
+	targetNamespace="urn:eu:stork:names:tc:STORK:1.0:assertion" 
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	xmlns:storkp="urn:eu:stork:names:tc:STORK:1.0:protocol" 
+	xmlns:stork="urn:eu:stork:names:tc:STORK:1.0:assertion">
+	<!--QAA -->
+	<xs:element name="QualityAuthenticationAssuranceLevel"
+		type="stork:QualityAuthenticationAssuranceLevelType" />
+	<xs:element name="spSector" type="stork:SPSectorType" />
+	<xs:element name="spApplication" type="stork:SPApplicationType" />
+	<xs:element name="spCountry" type="stork:CountryCodeType" />
+	<xs:element name="CitizenCountryCode" type="stork:CountryCodeType" />
+	<xs:element name="RequestedAttribute" type="stork:RequestedAttributeType" />
+	<xs:element name="AttributeValue" type="xs:anyType" />
+	<xs:element name="canonicalResidenceAddress" type="stork:canonicalAddressType" />
+	<xs:element name="countryCodeAddress" type="stork:CountryCodeType" />
+
+	<xs:element name="hasDegree" type="stork:hasDegreeType" />
+	<xs:element name="isStudent" type="stork:isStudentType" />
+	<xs:element name="isAcademicStaff" type="stork:isAcademicStaffType" />
+	<xs:element name="isTeacherOf" type="stork:isTeacherOfType" />
+	<xs:element name="isCourseCoordinator" type="stork:isCourseCoordinatorType" />
+	<xs:element name="isAdminStaff" type="stork:isAdminStaffType" />
+	<xs:element name="habilitation" type="stork:habilitationType" />
+	<xs:element name="acTitle" type="stork:acTitleType" />
+	<xs:element name="hasAccountInBank" type="stork:hasAccountInBankType" />
+	<xs:element name="isHealthCareProfessional" type="stork:isHealthCareProfessionalType" />
+	<xs:element name="canonicalRegisteredAddress" type="stork:canonicalAddressType" />
+	<xs:element name="AQAA"
+		type="stork:QualityAuthenticationAssuranceLevelType" />
+	<xs:element name="mandate" type="stork:mandateType" />
+	<xs:element name="study" type="stork:studyType" />
+	<xs:element name="HCPType" type="stork:HCPType" />
+
+	<xs:attribute name="AttributeStatus" type="stork:AttributeStatusType" />
+
+	<xs:simpleType name="SPSectorType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="1" />
+			<xs:maxLength value="20" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="SPApplicationType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="1" />
+			<xs:maxLength value="100" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="AttributeStatusType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Available" />
+			<xs:enumeration value="NotAvailable" />
+			<xs:enumeration value="Withheld" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="studyType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="2" />
+			<xs:maxLength value="5" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="LevelType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="1" />
+			<xs:maxLength value="1" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="currencyType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="3" />
+			<xs:maxLength value="3" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="occupationType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="1" />
+			<xs:maxLength value="1" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="titleNormalisedType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="1" />
+			<xs:maxLength value="1" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="HCPType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="1" />
+			<xs:maxLength value="1" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="specialisationType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="1" />
+			<xs:maxLength value="1" />
+		</xs:restriction>
+	</xs:simpleType>
+
+
+	<xs:simpleType name="QualityAuthenticationAssuranceLevelType">
+		<xs:restriction base="xs:integer">
+			<xs:minInclusive value="1" />
+			<xs:maxInclusive value="4" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:complexType name="canonicalAddressType">
+		<xs:sequence>
+			<xs:element name="countryCodeAddress" type="stork:CountryCodeType" />
+			<xs:element name="state" type="xs:string" minOccurs="0" />
+			<xs:element name="municipalityCode" type="xs:string"
+				minOccurs="0" />
+			<xs:element name="town" type="xs:string" />
+			<xs:element name="postalCode" type="xs:string" />
+			<xs:element name="streetName" type="xs:string" />
+			<xs:element name="streetNumber" type="xs:string"
+				minOccurs="0" />
+			<xs:element name="apartmentNumber" type="xs:string"
+				minOccurs="0" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="hasDegreeType">
+		<xs:sequence>
+			<xs:element name="study" type="stork:studyType" />
+			<xs:element name="level" type="stork:LevelType" />
+			<xs:element name="yearObtained" type="xs:integer" />
+			<xs:element name="nameOfInstitution" type="xs:string" />
+			<xs:element name="AQAA"
+				type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="isAcademicStaffType">
+		<xs:sequence>
+			<xs:element name="nameOfInstitution" type="xs:string" />
+			<xs:element name="occupation" type="stork:occupationType" />
+			<xs:element name="knowledgearea" type="xs:string" />
+			<xs:element name="AQAA"
+				type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="isTeacherOfType">
+		<xs:sequence>
+			<xs:element name="nameOfInstitution" type="xs:string" />
+			<xs:element name="course" type="xs:string" />
+			<xs:element name="role" type="xs:string" />
+			<xs:element name="AQAA"
+				type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="isCourseCoordinatorType">
+		<xs:sequence>
+			<xs:element name="courseCoodinator" type="xs:string" />
+			<xs:element name="AQAA"
+				type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="isAdminStaffType">
+		<xs:sequence>
+			<xs:element name="adminStaff" type="xs:string" />
+			<xs:element name="AQAA"
+				type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="habilitation">
+		<xs:sequence>
+			<xs:element name="ability" type="xs:string" />
+			<xs:element name="AQAA"
+				type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="acTitleType">
+		<xs:sequence>
+			<xs:element name="titleNormalised" type="stork:titleNormalisedType" />
+			<xs:element name="AQAA"
+				type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="hasAccountInBankType">
+		<xs:sequence>
+			<xs:element name="bankName" type="xs:string" />
+			<xs:element name="AQAA"
+				type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="isHCPType">
+		<xs:sequence>
+			<xs:element name="nameOfOrganisation" type="xs:string" />
+			<xs:element name="HCPType" type="stork:HCPType" />
+			<xs:element name="specialisation" type="stork:specialisationType" />
+			<xs:element name="AQAA"
+				type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="representationPersonType">
+		<xs:choice>
+			<xs:sequence>
+				<xs:element name="eIdentifier" type="xs:string" />
+				<xs:element name="givenName" type="xs:string" />
+				<xs:element name="surname" type="xs:string" />
+				<xs:element name="dateOfBirth" type="xs:string" />
+			</xs:sequence>
+			<xs:sequence>
+				<xs:element name="eLPIdentifier" type="xs:string" />
+				<xs:element name="name" type="xs:string" />
+				<xs:element name="address" type="xs:string" />
+				<xs:element name="canonicalAddress" type="stork:canonicalAddressType" />
+				<xs:element name="type" type="xs:string" />
+			</xs:sequence>
+		</xs:choice>
+	</xs:complexType>
+
+	<xs:complexType name="mandateType">
+		<xs:sequence>
+			<xs:element name="represented" type="stork:representationPersonType" />
+			<xs:element name="representing" type="stork:representationPersonType" />
+			<xs:element name="mandateContent" type="stork:mandateContentType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="mandateContentType">
+		<xs:sequence>
+			<xs:element name="validFrom" type="xs:date" />
+			<xs:element name="validTo" type="xs:date" />
+			<xs:element name="transactionLimit" type="xs:integer" />
+			<xs:element name="transactionLimitCurrency" type="stork:currencyType" />
+			<xs:element name="isJoint" type="xs:string" />
+			<xs:element name="ischained" type="xs:boolean" />
+			<xs:element name="typePower" type="xs:string" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:simpleType name="CountryCodeType">
+		<xs:restriction base="xs:token">
+			<xs:pattern value="[A-Z]{2}" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:complexType name="RequestedAttributeType">
+		<xs:sequence>
+			<xs:element minOccurs="0" maxOccurs="unbounded" ref="stork:AttributeValue" />
+		</xs:sequence>
+		<xs:attribute name="Name" use="required" type="xs:string" />
+		<xs:attribute name="NameFormat" use="required" type="xs:anyURI" />
+		<xs:attribute name="FriendlyName" use="optional" type="xs:string" />
+		<xs:attribute name="isRequired" use="optional" type="xs:boolean" />
+		<xs:anyAttribute namespace="##other" processContents="lax" />
+	</xs:complexType>
+
+	<xs:complexType name="isStudentType">
+		<xs:sequence>
+			<xs:element ref="stork:study" />
+			<xs:element name="nameOfInstitution" type="xs:string" />
+			<xs:element name="course" type="xs:integer" />
+			<xs:element name="AQAA"
+				type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="habilitationType">
+		<xs:sequence>
+			<xs:element name="ability" type="xs:string" />
+			<xs:element name="AQAA"
+				type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="isHealthCareProfessionalType">
+		<xs:sequence>
+			<xs:element name="nameOfOrganisation" type="xs:string" />
+			<xs:element ref="stork:HCPType" />
+			<xs:element ref="stork:specialisation" />
+			<xs:element name="AQAA"
+				type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:element name="specialisation" type="stork:specialisationType" />
+	<xs:simpleType name="medical">
+		<xs:restriction base="xs:string">
+			<xs:maxLength value="2" />
+			<xs:minLength value="2" />
+		</xs:restriction>
+	</xs:simpleType>
+
+</xs:schema>
diff --git a/id/server/stork2-commons/src/main/resources/.svn/text-base/log4j.xml.svn-base b/id/server/stork2-commons/src/main/resources/.svn/text-base/log4j.xml.svn-base
new file mode 100644
index 000000000..8bce0bec0
--- /dev/null
+++ b/id/server/stork2-commons/src/main/resources/.svn/text-base/log4j.xml.svn-base
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+	<appender name="MainLogger" class="org.apache.log4j.DailyRollingFileAppender">
+		<param name="File" value="/opt/storklogs/stork-commons.log" />
+		<param name="DatePattern" value="'.'yyyy-MM-dd" />
+		<param name="Append" value="true" />
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%d{HH:mm:ss:SSS} - %p - %C{1} - %m%n" />
+		</layout>
+	</appender>
+
+	<root>
+		<priority value="info" />
+		<appender-ref ref="MainLogger" />
+	</root>
+
+</log4j:configuration>
diff --git a/id/server/stork2-commons/src/main/resources/StorkcomplexAttributes.xsd b/id/server/stork2-commons/src/main/resources/StorkcomplexAttributes.xsd
new file mode 100644
index 000000000..3c56bd318
--- /dev/null
+++ b/id/server/stork2-commons/src/main/resources/StorkcomplexAttributes.xsd
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema elementFormDefault="qualified"
+	targetNamespace="urn:eu:stork:names:tc:STORK:1.0:assertion" 
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	xmlns:storkp="urn:eu:stork:names:tc:STORK:1.0:protocol" 
+	xmlns:stork="urn:eu:stork:names:tc:STORK:1.0:assertion">
+	<!--QAA -->
+	<xs:element name="QualityAuthenticationAssuranceLevel"
+		type="stork:QualityAuthenticationAssuranceLevelType" />
+	<xs:element name="spSector" type="stork:SPSectorType" />
+	<xs:element name="spApplication" type="stork:SPApplicationType" />
+	<xs:element name="spCountry" type="stork:CountryCodeType" />
+	<xs:element name="CitizenCountryCode" type="stork:CountryCodeType" />
+	<xs:element name="RequestedAttribute" type="stork:RequestedAttributeType" />
+	<xs:element name="AttributeValue" type="xs:anyType" />
+	<xs:element name="canonicalResidenceAddress" type="stork:canonicalAddressType" />
+	<xs:element name="countryCodeAddress" type="stork:CountryCodeType" />
+
+	<xs:element name="hasDegree" type="stork:hasDegreeType" />
+	<xs:element name="isStudent" type="stork:isStudentType" />
+	<xs:element name="isAcademicStaff" type="stork:isAcademicStaffType" />
+	<xs:element name="isTeacherOf" type="stork:isTeacherOfType" />
+	<xs:element name="isCourseCoordinator" type="stork:isCourseCoordinatorType" />
+	<xs:element name="isAdminStaff" type="stork:isAdminStaffType" />
+	<xs:element name="habilitation" type="stork:habilitationType" />
+	<xs:element name="acTitle" type="stork:acTitleType" />
+	<xs:element name="hasAccountInBank" type="stork:hasAccountInBankType" />
+	<xs:element name="isHealthCareProfessional" type="stork:isHealthCareProfessionalType" />
+	<xs:element name="canonicalRegisteredAddress" type="stork:canonicalAddressType" />
+	<xs:element name="AQAA"
+		type="stork:QualityAuthenticationAssuranceLevelType" />
+	<xs:element name="mandate" type="stork:mandateType" />
+	<xs:element name="study" type="stork:studyType" />
+	<xs:element name="HCPType" type="stork:HCPType" />
+
+	<xs:attribute name="AttributeStatus" type="stork:AttributeStatusType" />
+
+	<xs:simpleType name="SPSectorType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="1" />
+			<xs:maxLength value="20" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="SPApplicationType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="1" />
+			<xs:maxLength value="100" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="AttributeStatusType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Available" />
+			<xs:enumeration value="NotAvailable" />
+			<xs:enumeration value="Withheld" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="studyType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="2" />
+			<xs:maxLength value="5" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="LevelType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="1" />
+			<xs:maxLength value="1" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="currencyType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="3" />
+			<xs:maxLength value="3" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="occupationType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="1" />
+			<xs:maxLength value="1" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="titleNormalisedType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="1" />
+			<xs:maxLength value="1" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="HCPType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="1" />
+			<xs:maxLength value="1" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="specialisationType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="1" />
+			<xs:maxLength value="1" />
+		</xs:restriction>
+	</xs:simpleType>
+
+
+	<xs:simpleType name="QualityAuthenticationAssuranceLevelType">
+		<xs:restriction base="xs:integer">
+			<xs:minInclusive value="1" />
+			<xs:maxInclusive value="4" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:complexType name="canonicalAddressType">
+		<xs:sequence>
+			<xs:element name="countryCodeAddress" type="stork:CountryCodeType" />
+			<xs:element name="state" type="xs:string" minOccurs="0" />
+			<xs:element name="municipalityCode" type="xs:string"
+				minOccurs="0" />
+			<xs:element name="town" type="xs:string" />
+			<xs:element name="postalCode" type="xs:string" />
+			<xs:element name="streetName" type="xs:string" />
+			<xs:element name="streetNumber" type="xs:string"
+				minOccurs="0" />
+			<xs:element name="apartmentNumber" type="xs:string"
+				minOccurs="0" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="hasDegreeType">
+		<xs:sequence>
+			<xs:element name="study" type="stork:studyType" />
+			<xs:element name="level" type="stork:LevelType" />
+			<xs:element name="yearObtained" type="xs:integer" />
+			<xs:element name="nameOfInstitution" type="xs:string" />
+			<xs:element name="AQAA"
+				type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="isAcademicStaffType">
+		<xs:sequence>
+			<xs:element name="nameOfInstitution" type="xs:string" />
+			<xs:element name="occupation" type="stork:occupationType" />
+			<xs:element name="knowledgearea" type="xs:string" />
+			<xs:element name="AQAA"
+				type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="isTeacherOfType">
+		<xs:sequence>
+			<xs:element name="nameOfInstitution" type="xs:string" />
+			<xs:element name="course" type="xs:string" />
+			<xs:element name="role" type="xs:string" />
+			<xs:element name="AQAA"
+				type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="isCourseCoordinatorType">
+		<xs:sequence>
+			<xs:element name="courseCoodinator" type="xs:string" />
+			<xs:element name="AQAA"
+				type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="isAdminStaffType">
+		<xs:sequence>
+			<xs:element name="adminStaff" type="xs:string" />
+			<xs:element name="AQAA"
+				type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="habilitation">
+		<xs:sequence>
+			<xs:element name="ability" type="xs:string" />
+			<xs:element name="AQAA"
+				type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="acTitleType">
+		<xs:sequence>
+			<xs:element name="titleNormalised" type="stork:titleNormalisedType" />
+			<xs:element name="AQAA"
+				type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="hasAccountInBankType">
+		<xs:sequence>
+			<xs:element name="bankName" type="xs:string" />
+			<xs:element name="AQAA"
+				type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="isHCPType">
+		<xs:sequence>
+			<xs:element name="nameOfOrganisation" type="xs:string" />
+			<xs:element name="HCPType" type="stork:HCPType" />
+			<xs:element name="specialisation" type="stork:specialisationType" />
+			<xs:element name="AQAA"
+				type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="representationPersonType">
+		<xs:choice>
+			<xs:sequence>
+				<xs:element name="eIdentifier" type="xs:string" />
+				<xs:element name="givenName" type="xs:string" />
+				<xs:element name="surname" type="xs:string" />
+				<xs:element name="dateOfBirth" type="xs:string" />
+			</xs:sequence>
+			<xs:sequence>
+				<xs:element name="eLPIdentifier" type="xs:string" />
+				<xs:element name="name" type="xs:string" />
+				<xs:element name="address" type="xs:string" />
+				<xs:element name="canonicalAddress" type="stork:canonicalAddressType" />
+				<xs:element name="type" type="xs:string" />
+			</xs:sequence>
+		</xs:choice>
+	</xs:complexType>
+
+	<xs:complexType name="mandateType">
+		<xs:sequence>
+			<xs:element name="represented" type="stork:representationPersonType" />
+			<xs:element name="representing" type="stork:representationPersonType" />
+			<xs:element name="mandateContent" type="stork:mandateContentType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="mandateContentType">
+		<xs:sequence>
+			<xs:element name="validFrom" type="xs:date" />
+			<xs:element name="validTo" type="xs:date" />
+			<xs:element name="transactionLimit" type="xs:integer" />
+			<xs:element name="transactionLimitCurrency" type="stork:currencyType" />
+			<xs:element name="isJoint" type="xs:string" />
+			<xs:element name="ischained" type="xs:boolean" />
+			<xs:element name="typePower" type="xs:string" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:simpleType name="CountryCodeType">
+		<xs:restriction base="xs:token">
+			<xs:pattern value="[A-Z]{2}" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:complexType name="RequestedAttributeType">
+		<xs:sequence>
+			<xs:element minOccurs="0" maxOccurs="unbounded" ref="stork:AttributeValue" />
+		</xs:sequence>
+		<xs:attribute name="Name" use="required" type="xs:string" />
+		<xs:attribute name="NameFormat" use="required" type="xs:anyURI" />
+		<xs:attribute name="FriendlyName" use="optional" type="xs:string" />
+		<xs:attribute name="isRequired" use="optional" type="xs:boolean" />
+		<xs:anyAttribute namespace="##other" processContents="lax" />
+	</xs:complexType>
+
+	<xs:complexType name="isStudentType">
+		<xs:sequence>
+			<xs:element ref="stork:study" />
+			<xs:element name="nameOfInstitution" type="xs:string" />
+			<xs:element name="course" type="xs:integer" />
+			<xs:element name="AQAA"
+				type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="habilitationType">
+		<xs:sequence>
+			<xs:element name="ability" type="xs:string" />
+			<xs:element name="AQAA"
+				type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="isHealthCareProfessionalType">
+		<xs:sequence>
+			<xs:element name="nameOfOrganisation" type="xs:string" />
+			<xs:element ref="stork:HCPType" />
+			<xs:element ref="stork:specialisation" />
+			<xs:element name="AQAA"
+				type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:element name="specialisation" type="stork:specialisationType" />
+	<xs:simpleType name="medical">
+		<xs:restriction base="xs:string">
+			<xs:maxLength value="2" />
+			<xs:minLength value="2" />
+		</xs:restriction>
+	</xs:simpleType>
+
+</xs:schema>
diff --git a/id/server/stork2-commons/src/main/resources/log4j.xml b/id/server/stork2-commons/src/main/resources/log4j.xml
new file mode 100644
index 000000000..8bce0bec0
--- /dev/null
+++ b/id/server/stork2-commons/src/main/resources/log4j.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+	<appender name="MainLogger" class="org.apache.log4j.DailyRollingFileAppender">
+		<param name="File" value="/opt/storklogs/stork-commons.log" />
+		<param name="DatePattern" value="'.'yyyy-MM-dd" />
+		<param name="Append" value="true" />
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%d{HH:mm:ss:SSS} - %p - %C{1} - %m%n" />
+		</layout>
+	</appender>
+
+	<root>
+		<priority value="info" />
+		<appender-ref ref="MainLogger" />
+	</root>
+
+</log4j:configuration>
-- 
cgit v1.2.3