From 9ef2e8fc5a59abcadc71714da371605bc1fdafa5 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 4 Feb 2014 09:58:38 +0100
Subject: add STORK attribut builder

---
 .../moa/id/demoOA/servlet/pvp2/BuildMetadata.java  |   4 +-
 .../moa/id/auth/stork/STORKConstants.java          | 119 +++
 .../attributes/OAuth20AttributeBuilder.java        |  39 +-
 .../oauth20/protocol/OAuth20AuthAction.java        |   4 +-
 .../moa/id/protocols/pvp2x/MetadataAction.java     |   8 +-
 .../pvp2x/builder/PVPAttributeBuilder.java         |  32 +
 .../pvp2x/builder/attributes/EIDSTORKTOKEN.java    |  78 ++
 .../STORKAdoptedFamilyNameAttributBuilder.java     |  49 ++
 .../attributes/STORKAgeAttributBuilder.java        |  49 ++
 .../builder/attributes/STORKAttributHelper.java    |  68 ++
 ...RKCanonicalResidenceAddressAttributBuilder.java |  49 ++
 .../STORKCountryCodeOfBirthAttributBuilder.java    |  49 ++
 .../STORKFiscalNumberAttributBuilder.java          |  49 ++
 .../attributes/STORKGenderAttributBuilder.java     |  49 ++
 .../STORKInhertedFamilyNameAttributBuilder.java    |  49 ++
 .../attributes/STORKIsAgeOverAttributBuilder.java  |  49 ++
 .../STORKMaritalStatusAttributBuilder.java         |  49 ++
 .../STORKNationalityCodeAttributBuilder.java       |  49 ++
 .../attributes/STORKPseudonymAttributBuilder.java  |  49 ++
 .../STORKResidencePermitAttributBuilder.java       |  49 ++
 .../STORKTextResidenceAddressAttributBuilder.java  |  49 ++
 .../attributes/STORKTitleAttributBuilder.java      |  49 ++
 .../pvp2x/exceptions/QAANotAllowedException.java   |  40 +
 .../protocols/pvp2x/exceptions/loginFormFull.html  | 851 +++++++++++++++++++++
 .../egovernment/moa/id/util/QAALevelVerifier.java  |  43 ++
 25 files changed, 1967 insertions(+), 5 deletions(-)
 create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKConstants.java
 create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/EIDSTORKTOKEN.java
 create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKAdoptedFamilyNameAttributBuilder.java
 create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKAgeAttributBuilder.java
 create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKAttributHelper.java
 create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKCanonicalResidenceAddressAttributBuilder.java
 create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKCountryCodeOfBirthAttributBuilder.java
 create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKFiscalNumberAttributBuilder.java
 create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKGenderAttributBuilder.java
 create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKInhertedFamilyNameAttributBuilder.java
 create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKIsAgeOverAttributBuilder.java
 create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKMaritalStatusAttributBuilder.java
 create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKNationalityCodeAttributBuilder.java
 create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKPseudonymAttributBuilder.java
 create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKResidencePermitAttributBuilder.java
 create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKTextResidenceAddressAttributBuilder.java
 create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKTitleAttributBuilder.java
 create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/exceptions/QAANotAllowedException.java
 create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/exceptions/loginFormFull.html
 create mode 100644 id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/QAALevelVerifier.java

(limited to 'id')

diff --git a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/BuildMetadata.java b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/BuildMetadata.java
index 72a253694..4e13a34df 100644
--- a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/BuildMetadata.java
+++ b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/BuildMetadata.java
@@ -170,8 +170,10 @@ public class BuildMetadata extends HttpServlet {
 					config.getPVP2KeystoreAuthRequestKeyPassword().toCharArray());			
 			KeyDescriptor signKeyDescriptor = SAML2Utils
 					.createSAMLObject(KeyDescriptor.class);
+			
 			signKeyDescriptor.setUse(UsageType.SIGNING);
-			signKeyDescriptor.setKeyInfo(keyInfoGenerator.generate(authcredential));	
+			signKeyDescriptor.setKeyInfo(keyInfoGenerator.generate(authcredential));
+			
 			spSSODescriptor.getKeyDescriptors().add(signKeyDescriptor);
 			
 			
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKConstants.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKConstants.java
new file mode 100644
index 000000000..eac1596ab
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKConstants.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ */
+package at.gv.egovernment.moa.id.auth.stork;
+
+/**
+ * @author tlenz
+ *
+ */
+public class STORKConstants {
+	
+	public static final String STORK_NAME_PREFIX = "http://www.stork.gov.eu/1.0/";
+	
+	public static final String EIDENTIFIER_FRIENDLYNAME = "eIdentifier";
+	public static final String EIDENTIFIER_NAME = STORK_NAME_PREFIX + EIDENTIFIER_FRIENDLYNAME;
+		
+	public static final String GIVENNAME_FRIENDLYNAME = "givenName";
+	public static final String GIVENNAME_NAME = STORK_NAME_PREFIX + GIVENNAME_FRIENDLYNAME;  
+	
+	public static final String SURENAME_FRIENDLYNAME = "surname";
+	public static final String SURENAME_NAME = STORK_NAME_PREFIX + SURENAME_FRIENDLYNAME; 
+	
+	public static final String INHERITEDFAMILYNAME_FRIENDLYNAME = "inheritedFamilyName";
+	public static final String INHERITEDFAMILYNAME_NAME = STORK_NAME_PREFIX + INHERITEDFAMILYNAME_FRIENDLYNAME;
+			
+	public static final String ADOPTEDFAMILYNAME_FRIENDLYNAME = "adoptedFamilyName";
+	public static final String ADOPTEDFAMILYNAME_NAME = STORK_NAME_PREFIX + ADOPTEDFAMILYNAME_FRIENDLYNAME;
+			
+	public static final String GENDER_FRIENDLYNAME = "gender";
+	public static final String GENDER_NAME = STORK_NAME_PREFIX + GENDER_FRIENDLYNAME;
+			
+	public static final String DATEOFBIRTH_FRIENDLYNAME = "dateOfBirth";
+	public static final String DATEOFBIRTH_NAME = STORK_NAME_PREFIX + DATEOFBIRTH_FRIENDLYNAME;
+			
+	public static final String CONTRYCODEOFBIRTH_FRIENDLYNAME = "countryCodeOfBirth";
+	public static final String CONTRYCODEOFBIRTH_NAME = STORK_NAME_PREFIX + CONTRYCODEOFBIRTH_FRIENDLYNAME;
+			
+	public static final String NATIONALITYCODE_FRIENDLYNAME = "nationalityCode";
+	public static final String NATIONALITYCODE_NAME = STORK_NAME_PREFIX +  NATIONALITYCODE_FRIENDLYNAME;
+			
+	public static final String MARITALSTATUS_FRIENDLYNAME = "maritalStatus";
+	public static final String MARITALSTATUS_NAME = STORK_NAME_PREFIX + MARITALSTATUS_FRIENDLYNAME;
+			
+	public static final String RESIDENCEADDRESS_FRIENDLYNAME = "residenceAddress";
+	public static final String RESIDENCEADDRESS_NAME = STORK_NAME_PREFIX + RESIDENCEADDRESS_FRIENDLYNAME;
+			
+	public static final String EMAIL_FRIENDLYNAME = "eMail";
+	public static final String EMAIL_NAME = STORK_NAME_PREFIX + EMAIL_FRIENDLYNAME;
+			
+	public static final String ACADEMICTITLE_FRIENDLYNAME = "academicTitle";
+	public static final String ACADEMICTITLE_NAME = STORK_NAME_PREFIX + ACADEMICTITLE_FRIENDLYNAME;
+			
+	public static final String PSEUDONYM_FRIENDLYNAME = "pseudonym";
+	public static final String PSEUDONYM_NAME = STORK_NAME_PREFIX + PSEUDONYM_FRIENDLYNAME;
+			
+	public static final String AGE_FRIENDLYNAME = "age";
+	public static final String AGE_NAME = STORK_NAME_PREFIX + AGE_FRIENDLYNAME;
+			
+	public static final String ISAGEOVER_FRIENDLYNAME = "isAgeOver";
+	public static final String ISAGEOVER_NAME = STORK_NAME_PREFIX + ISAGEOVER_FRIENDLYNAME;
+			
+	public static final String TEXTRESIDENCEADDRESS_FRIENDLYNAME = "textResidenceAddress";
+	public static final String TEXTRESIDENCEADDRESS_NAME = STORK_NAME_PREFIX + TEXTRESIDENCEADDRESS_FRIENDLYNAME;
+			
+	public static final String CANONICALRESIDENCEADDRESS_FRIENDLYNAME = "canonicalResidenceAddress";
+	public static final String CANONICALRESIDENCEADDRESS_NAME = STORK_NAME_PREFIX + CANONICALRESIDENCEADDRESS_FRIENDLYNAME;
+			
+	public static final String TITLE_FRIENDLYNAME = "title";
+	public static final String TITLE_NAME = STORK_NAME_PREFIX + TITLE_FRIENDLYNAME;
+			
+	public static final String RESIDENCEPERMIT_FRIENDLYNAME = "residencePermit";
+	public static final String RESIDENCEPERMIT_NAME = STORK_NAME_PREFIX + RESIDENCEPERMIT_FRIENDLYNAME;
+
+	public static final String SIGNEDDOC_FRIENDLYNAME = "signedDoc";
+	public static final String SIGNEDDOC_NAME = STORK_NAME_PREFIX + SIGNEDDOC_FRIENDLYNAME;
+			
+	public static final String CITIZEN509CERTIFICATE_FRIENDLYNAME = "citizen509Certificate";
+	public static final String CITIZEN509CERTIFICATE_NAME = STORK_NAME_PREFIX + CITIZEN509CERTIFICATE_FRIENDLYNAME;
+			
+	public static final String NEWATTRIBUTE1_FRIENDLYNAME = "newAttribute1";
+	public static final String NEWATTRIBUTE1_NAME = STORK_NAME_PREFIX + NEWATTRIBUTE1_FRIENDLYNAME;
+		
+	public static final String NEWATTRIBUT2_FRIENDLYNAME = "newAttribute2";
+	public static final String NEWATTRIBUT2_NAME = STORK_NAME_PREFIX + NEWATTRIBUT2_FRIENDLYNAME;
+			
+	public static final String HASDEGREE_FRIENDLYNAME = "hasDegree"; 
+	public static final String HASDEGREE_NAME = STORK_NAME_PREFIX + HASDEGREE_FRIENDLYNAME;
+			
+	public static final String MANDATECONTENT_FRIENDLYNAME = "mandateContent";
+	public static final String MANDATECONTENT_NAME = STORK_NAME_PREFIX + MANDATECONTENT_FRIENDLYNAME;
+			
+	public static final String REPRESENTATIVE_FRIENDLYNAME = "representative";
+	public static final String REPRESENTATIVE_NAME = STORK_NAME_PREFIX + REPRESENTATIVE_FRIENDLYNAME;
+			
+	public static final String REPRESENTED_FRIENDLYNAME = "represented";
+	public static final String REPRESENTED_NAME = STORK_NAME_PREFIX + REPRESENTED_FRIENDLYNAME;
+	
+	public static final String FISCALNUMBER_FRIENDLYNAME = "fiscalNumber";
+	public static final String FISCALNUMBER_NAME = STORK_NAME_PREFIX + FISCALNUMBER_FRIENDLYNAME;
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/attributes/OAuth20AttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/attributes/OAuth20AttributeBuilder.java
index aedf0dbce..7bb97b9d8 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/attributes/OAuth20AttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/attributes/OAuth20AttributeBuilder.java
@@ -37,6 +37,7 @@ import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.EIDCcsURL;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.EIDCitizenQAALevelAttributeBuilder;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.EIDIdentityLinkBuilder;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.EIDIssuingNationAttributeBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.EIDSTORKTOKEN;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.EIDSectorForIDAttributeBuilder;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.EIDSignerCertificate;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.EIDSourcePIN;
@@ -56,6 +57,20 @@ import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.MandateProfRe
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.MandateProfRepOIDAttributeBuilder;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.MandateReferenceValueAttributeBuilder;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.MandateTypeAttributeBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKAdoptedFamilyNameAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKAgeAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKCanonicalResidenceAddressAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKCountryCodeOfBirthAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKFiscalNumberAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKGenderAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKInhertedFamilyNameAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKIsAgeOverAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKMaritalStatusAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKNationalityCodeAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKPseudonymAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKResidencePermitAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKTextResidenceAddressAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKTitleAttributBuilder;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.AttributeException;
 import at.gv.egovernment.moa.logging.Logger;
 
@@ -93,7 +108,7 @@ public final class OAuth20AttributeBuilder {
 	private static final List<IAttributeBuilder> buildersEID = new ArrayList<IAttributeBuilder>();
 	private static final List<IAttributeBuilder> buildersEIDGov = new ArrayList<IAttributeBuilder>();
 	private static final List<IAttributeBuilder> buildersMandate = new ArrayList<IAttributeBuilder>();
-	
+	private static final List<IAttributeBuilder> buildersSTORK = new ArrayList<IAttributeBuilder>();
 	static {
 		// openId
 		buildersOpenId.add(new OpenIdIssuerAttribute());
@@ -138,6 +153,24 @@ public final class OAuth20AttributeBuilder {
 		
 		buildersMandate.add(new MandateProfRepOIDAttributeBuilder());
 		buildersMandate.add(new MandateProfRepDescAttributeBuilder());
+				
+		// STORK
+		buildersSTORK.add(new EIDSTORKTOKEN());
+		buildersSTORK.add(new EIDSTORKTOKEN());
+		buildersSTORK.add(new STORKAdoptedFamilyNameAttributBuilder());
+		buildersSTORK.add(new STORKAgeAttributBuilder());
+		buildersSTORK.add(new STORKCanonicalResidenceAddressAttributBuilder());
+		buildersSTORK.add(new STORKCountryCodeOfBirthAttributBuilder());
+		buildersSTORK.add(new STORKFiscalNumberAttributBuilder());
+		buildersSTORK.add(new STORKGenderAttributBuilder());
+		buildersSTORK.add(new STORKInhertedFamilyNameAttributBuilder());
+		buildersSTORK.add(new STORKIsAgeOverAttributBuilder());
+		buildersSTORK.add(new STORKMaritalStatusAttributBuilder());
+		buildersSTORK.add(new STORKNationalityCodeAttributBuilder());
+		buildersSTORK.add(new STORKPseudonymAttributBuilder());
+		buildersSTORK.add(new STORKResidencePermitAttributBuilder());
+		buildersSTORK.add(new STORKTextResidenceAddressAttributBuilder());
+		buildersSTORK.add(new STORKTitleAttributBuilder());
 	}
 	
 	private static void addAttibutes(final List<IAttributeBuilder> builders, final JsonObject jsonObject,
@@ -180,4 +213,8 @@ public final class OAuth20AttributeBuilder {
 		addAttibutes(buildersMandate, jsonObject, authSession, oaParam, authData);
 	}
 	
+	public static void addScopeSTORK(final JsonObject jsonObject, final AuthenticationSession authSession,
+			final OAAuthParameter oaParam, final AuthenticationData authData) {
+		addAttibutes(buildersSTORK, jsonObject, authSession, oaParam, authData);
+	}
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20AuthAction.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20AuthAction.java
index 9eefa5bf3..d60b8c230 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20AuthAction.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20AuthAction.java
@@ -164,8 +164,10 @@ class OAuth20AuthAction implements IAction {
 			} else if (s.equalsIgnoreCase("mandate")) {
 				OAuth20AttributeBuilder.addScopeMandate(token.getPayloadAsJsonObject(), session, oaParam, authData);
 				resultScopes.append(" mandate");
+			} else if (s.equalsIgnoreCase("stork")) {
+				OAuth20AttributeBuilder.addScopeSTORK(token.getPayloadAsJsonObject(), session, oaParam, authData);
+				resultScopes.append(" stork");
 			}
-			// TODO parser STORK
 		}
 		
 		// add properties and sign
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/MetadataAction.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/MetadataAction.java
index 402927261..78fe43daa 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/MetadataAction.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/MetadataAction.java
@@ -88,9 +88,13 @@ public class MetadataAction implements IAction {
 
 			idpEntitiesDescriptor.getEntityDescriptors().add(idpEntityDescriptor);
 			
-			idpEntityDescriptor
-					.setEntityID(PVPConfiguration.getInstance().getIDPSSOMetadataService());
+			//TODO: maybe change EntityID to Metadata URL
+			//idpEntityDescriptor
+			//		.setEntityID(PVPConfiguration.getInstance().getIDPSSOMetadataService());
 
+			idpEntityDescriptor
+			.setEntityID(PVPConfiguration.getInstance().getIDPPublicPath());
+			
 			idpEntityDescriptor.setValidUntil(date.plusDays(VALIDUNTIL_IN_DAYES));
 			
 			List<ContactPerson> persons = PVPConfiguration.getInstance()
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/PVPAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/PVPAttributeBuilder.java
index 37bd83932..39e35120c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/PVPAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/PVPAttributeBuilder.java
@@ -39,6 +39,7 @@ import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.EIDCcsURL;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.EIDCitizenQAALevelAttributeBuilder;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.EIDIdentityLinkBuilder;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.EIDIssuingNationAttributeBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.EIDSTORKTOKEN;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.EIDSectorForIDAttributeBuilder;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.EIDSignerCertificate;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.EIDSourcePIN;
@@ -62,6 +63,20 @@ import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.MandateRefere
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.MandateTypeAttributeBuilder;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.PVPVersionAttributeBuilder;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.PrincipalNameAttributeBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKAdoptedFamilyNameAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKAgeAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKCanonicalResidenceAddressAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKCountryCodeOfBirthAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKFiscalNumberAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKGenderAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKInhertedFamilyNameAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKIsAgeOverAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKMaritalStatusAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKNationalityCodeAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKPseudonymAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKResidencePermitAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKTextResidenceAddressAttributBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.STORKTitleAttributBuilder;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.SamlAttributeGenerator;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.AttributeException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.InvalidDateFormatAttributeException;
@@ -116,6 +131,23 @@ public class PVPAttributeBuilder {
 		addBuilder(new MandateProfRepDescAttributeBuilder());
 		addBuilder(new MandateReferenceValueAttributeBuilder());
 		addBuilder(new MandateFullMandateAttributeBuilder());
+		
+		//STORK Attributes
+		addBuilder(new EIDSTORKTOKEN());
+		addBuilder(new STORKAdoptedFamilyNameAttributBuilder());
+		addBuilder(new STORKAgeAttributBuilder());
+		addBuilder(new STORKCanonicalResidenceAddressAttributBuilder());
+		addBuilder(new STORKCountryCodeOfBirthAttributBuilder());
+		addBuilder(new STORKFiscalNumberAttributBuilder());
+		addBuilder(new STORKGenderAttributBuilder());
+		addBuilder(new STORKInhertedFamilyNameAttributBuilder());
+		addBuilder(new STORKIsAgeOverAttributBuilder());
+		addBuilder(new STORKMaritalStatusAttributBuilder());
+		addBuilder(new STORKNationalityCodeAttributBuilder());
+		addBuilder(new STORKPseudonymAttributBuilder());
+		addBuilder(new STORKResidencePermitAttributBuilder());
+		addBuilder(new STORKTextResidenceAddressAttributBuilder());
+		addBuilder(new STORKTitleAttributBuilder());		
 	}
 	
 	public static Attribute buildAttribute(String name, AuthenticationSession authSession, OAAuthParameter oaParam,
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/EIDSTORKTOKEN.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/EIDSTORKTOKEN.java
new file mode 100644
index 000000000..e3e33d6db
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/EIDSTORKTOKEN.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ *******************************************************************************/
+package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
+
+import eu.stork.peps.auth.commons.IPersonalAttributeList;
+import eu.stork.peps.auth.commons.PersonalAttribute;
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.stork.STORKConstants;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.AttributeException;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.UnavailableAttributeException;
+import at.gv.egovernment.moa.logging.Logger;
+
+public class EIDSTORKTOKEN implements IPVPAttributeBuilder  {
+
+	public String getName() {
+		return EID_STORK_TOKEN_NAME;
+	}
+
+	public <ATT> ATT build(AuthenticationSession authSession, OAAuthParameter oaParam, AuthenticationData authData,
+			IAttributeGenerator<ATT> g) throws AttributeException {
+		
+		
+		if (!authSession.isForeigner()) {
+			throw new UnavailableAttributeException(EID_STORK_TOKEN_NAME);
+			
+		} else {
+			IPersonalAttributeList storkAttributes = authSession.getStorkAttributes();
+			
+			if ( storkAttributes == null ) {
+				throw new UnavailableAttributeException(EID_STORK_TOKEN_NAME);
+				
+			}
+
+			try {
+				PersonalAttribute attribut = storkAttributes.get(STORKConstants.EIDENTIFIER_NAME);
+				ATT attr;
+				if (attribut != null) {
+					
+					attr = g.buildStringAttribute(EID_STORK_TOKEN_FRIENDLY_NAME, EID_STORK_TOKEN_NAME, attribut.getValue().get(0));					
+					return attr; 
+					
+				} else
+					throw new UnavailableAttributeException(EID_STORK_TOKEN_NAME);
+				
+			} catch (Exception e) {
+				Logger.warn("Attribut " + EID_STORK_TOKEN_FRIENDLY_NAME + " generation error", e);
+				throw new UnavailableAttributeException(EID_STORK_TOKEN_NAME);
+			}
+		}
+	}
+
+	public <ATT> ATT buildEmpty(IAttributeGenerator<ATT> g) {
+		return g.buildEmptyAttribute(EID_STORK_TOKEN_FRIENDLY_NAME, EID_STORK_TOKEN_NAME);
+	}
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKAdoptedFamilyNameAttributBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKAdoptedFamilyNameAttributBuilder.java
new file mode 100644
index 000000000..b81b30e5b
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKAdoptedFamilyNameAttributBuilder.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ *******************************************************************************/
+package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
+
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.stork.STORKConstants;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.AttributeException;
+
+public class STORKAdoptedFamilyNameAttributBuilder implements IPVPAttributeBuilder  {
+
+	public String getName() {
+		return STORKConstants.ADOPTEDFAMILYNAME_NAME;
+	}
+
+	public <ATT> ATT build(AuthenticationSession authSession, OAAuthParameter oaParam, AuthenticationData authData,
+			IAttributeGenerator<ATT> g) throws AttributeException {
+		
+		return g.buildStringAttribute(STORKConstants.ADOPTEDFAMILYNAME_FRIENDLYNAME, STORKConstants.ADOPTEDFAMILYNAME_NAME, 
+				STORKAttributHelper.getAttribut(STORKConstants.ADOPTEDFAMILYNAME_NAME, authSession)); 
+					
+	}
+
+	public <ATT> ATT buildEmpty(IAttributeGenerator<ATT> g) {
+		return g.buildEmptyAttribute(STORKConstants.ADOPTEDFAMILYNAME_FRIENDLYNAME, STORKConstants.ADOPTEDFAMILYNAME_NAME);
+	}
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKAgeAttributBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKAgeAttributBuilder.java
new file mode 100644
index 000000000..98fe853ff
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKAgeAttributBuilder.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ *******************************************************************************/
+package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
+
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.stork.STORKConstants;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.AttributeException;
+
+public class STORKAgeAttributBuilder implements IPVPAttributeBuilder  {
+
+	public String getName() {
+		return STORKConstants.AGE_NAME;
+	}
+
+	public <ATT> ATT build(AuthenticationSession authSession, OAAuthParameter oaParam, AuthenticationData authData,
+			IAttributeGenerator<ATT> g) throws AttributeException {
+		
+		return g.buildStringAttribute(STORKConstants.AGE_FRIENDLYNAME, STORKConstants.AGE_NAME, 
+				STORKAttributHelper.getAttribut(STORKConstants.AGE_NAME, authSession)); 
+					
+	}
+
+	public <ATT> ATT buildEmpty(IAttributeGenerator<ATT> g) {
+		return g.buildEmptyAttribute(STORKConstants.AGE_FRIENDLYNAME, STORKConstants.AGE_NAME);
+	}
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKAttributHelper.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKAttributHelper.java
new file mode 100644
index 000000000..6d2b031a5
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKAttributHelper.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ */
+package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
+
+import eu.stork.peps.auth.commons.IPersonalAttributeList;
+import eu.stork.peps.auth.commons.PersonalAttribute;
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.stork.STORKConstants;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.UnavailableAttributeException;
+import at.gv.egovernment.moa.logging.Logger;
+
+/**
+ * @author tlenz
+ *
+ */
+public class STORKAttributHelper {
+
+	public static String getAttribut(String attributName,
+			AuthenticationSession authSession) throws UnavailableAttributeException {
+		
+		if (!authSession.isForeigner()) {
+			throw new UnavailableAttributeException(attributName);
+			
+		} else {
+			IPersonalAttributeList storkAttributes = authSession.getStorkAttributes();
+			
+			if ( storkAttributes == null ) {
+				throw new UnavailableAttributeException(attributName);
+				
+			}
+
+			try {
+				PersonalAttribute attribut = storkAttributes.get(attributName);
+				if (attribut != null) {
+					
+					return attribut.getValue().get(0);					 
+					
+				} else
+					throw new UnavailableAttributeException(attributName);
+				
+			} catch (Exception e) {
+				Logger.warn("Attribut " + attributName + " generation error", e);
+				throw new UnavailableAttributeException(attributName);
+			}
+		}
+		
+	}
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKCanonicalResidenceAddressAttributBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKCanonicalResidenceAddressAttributBuilder.java
new file mode 100644
index 000000000..c3d6f070d
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKCanonicalResidenceAddressAttributBuilder.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ *******************************************************************************/
+package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
+
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.stork.STORKConstants;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.AttributeException;
+
+public class STORKCanonicalResidenceAddressAttributBuilder implements IPVPAttributeBuilder  {
+
+	public String getName() {
+		return STORKConstants.CANONICALRESIDENCEADDRESS_NAME;
+	}
+
+	public <ATT> ATT build(AuthenticationSession authSession, OAAuthParameter oaParam, AuthenticationData authData,
+			IAttributeGenerator<ATT> g) throws AttributeException {
+		
+		return g.buildStringAttribute(STORKConstants.CANONICALRESIDENCEADDRESS_FRIENDLYNAME, STORKConstants.CANONICALRESIDENCEADDRESS_NAME, 
+				STORKAttributHelper.getAttribut(STORKConstants.CANONICALRESIDENCEADDRESS_NAME, authSession)); 
+					
+	}
+
+	public <ATT> ATT buildEmpty(IAttributeGenerator<ATT> g) {
+		return g.buildEmptyAttribute(STORKConstants.CANONICALRESIDENCEADDRESS_FRIENDLYNAME, STORKConstants.CANONICALRESIDENCEADDRESS_NAME);
+	}
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKCountryCodeOfBirthAttributBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKCountryCodeOfBirthAttributBuilder.java
new file mode 100644
index 000000000..c873a86ea
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKCountryCodeOfBirthAttributBuilder.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ *******************************************************************************/
+package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
+
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.stork.STORKConstants;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.AttributeException;
+
+public class STORKCountryCodeOfBirthAttributBuilder implements IPVPAttributeBuilder  {
+
+	public String getName() {
+		return STORKConstants.CONTRYCODEOFBIRTH_NAME;
+	}
+
+	public <ATT> ATT build(AuthenticationSession authSession, OAAuthParameter oaParam, AuthenticationData authData,
+			IAttributeGenerator<ATT> g) throws AttributeException {
+		
+		return g.buildStringAttribute(STORKConstants.CONTRYCODEOFBIRTH_FRIENDLYNAME, STORKConstants.CONTRYCODEOFBIRTH_NAME, 
+				STORKAttributHelper.getAttribut(STORKConstants.CONTRYCODEOFBIRTH_NAME, authSession)); 
+					
+	}
+
+	public <ATT> ATT buildEmpty(IAttributeGenerator<ATT> g) {
+		return g.buildEmptyAttribute(STORKConstants.CONTRYCODEOFBIRTH_FRIENDLYNAME, STORKConstants.CONTRYCODEOFBIRTH_NAME);
+	}
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKFiscalNumberAttributBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKFiscalNumberAttributBuilder.java
new file mode 100644
index 000000000..394bffa31
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKFiscalNumberAttributBuilder.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ *******************************************************************************/
+package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
+
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.stork.STORKConstants;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.AttributeException;
+
+public class STORKFiscalNumberAttributBuilder implements IPVPAttributeBuilder  {
+
+	public String getName() {
+		return STORKConstants.FISCALNUMBER_NAME;
+	}
+
+	public <ATT> ATT build(AuthenticationSession authSession, OAAuthParameter oaParam, AuthenticationData authData,
+			IAttributeGenerator<ATT> g) throws AttributeException {
+		
+		return g.buildStringAttribute(STORKConstants.FISCALNUMBER_FRIENDLYNAME, STORKConstants.FISCALNUMBER_NAME, 
+				STORKAttributHelper.getAttribut(STORKConstants.FISCALNUMBER_NAME, authSession)); 
+					
+	}
+
+	public <ATT> ATT buildEmpty(IAttributeGenerator<ATT> g) {
+		return g.buildEmptyAttribute(STORKConstants.FISCALNUMBER_FRIENDLYNAME, STORKConstants.FISCALNUMBER_NAME);
+	}
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKGenderAttributBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKGenderAttributBuilder.java
new file mode 100644
index 000000000..9209e73c4
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKGenderAttributBuilder.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ *******************************************************************************/
+package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
+
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.stork.STORKConstants;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.AttributeException;
+
+public class STORKGenderAttributBuilder implements IPVPAttributeBuilder  {
+
+	public String getName() {
+		return STORKConstants.GENDER_NAME;
+	}
+
+	public <ATT> ATT build(AuthenticationSession authSession, OAAuthParameter oaParam, AuthenticationData authData,
+			IAttributeGenerator<ATT> g) throws AttributeException {
+		
+		return g.buildStringAttribute(STORKConstants.GENDER_FRIENDLYNAME, STORKConstants.GENDER_NAME, 
+				STORKAttributHelper.getAttribut(STORKConstants.GENDER_NAME, authSession)); 
+					
+	}
+
+	public <ATT> ATT buildEmpty(IAttributeGenerator<ATT> g) {
+		return g.buildEmptyAttribute(STORKConstants.GENDER_FRIENDLYNAME, STORKConstants.GENDER_NAME);
+	}
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKInhertedFamilyNameAttributBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKInhertedFamilyNameAttributBuilder.java
new file mode 100644
index 000000000..59f345bd3
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKInhertedFamilyNameAttributBuilder.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ *******************************************************************************/
+package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
+
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.stork.STORKConstants;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.AttributeException;
+
+public class STORKInhertedFamilyNameAttributBuilder implements IPVPAttributeBuilder  {
+
+	public String getName() {
+		return STORKConstants.INHERITEDFAMILYNAME_NAME;
+	}
+
+	public <ATT> ATT build(AuthenticationSession authSession, OAAuthParameter oaParam, AuthenticationData authData,
+			IAttributeGenerator<ATT> g) throws AttributeException {
+		
+		return g.buildStringAttribute(STORKConstants.INHERITEDFAMILYNAME_FRIENDLYNAME, STORKConstants.INHERITEDFAMILYNAME_NAME, 
+				STORKAttributHelper.getAttribut(STORKConstants.INHERITEDFAMILYNAME_NAME, authSession)); 
+					
+	}
+
+	public <ATT> ATT buildEmpty(IAttributeGenerator<ATT> g) {
+		return g.buildEmptyAttribute(STORKConstants.INHERITEDFAMILYNAME_FRIENDLYNAME, STORKConstants.INHERITEDFAMILYNAME_NAME);
+	}
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKIsAgeOverAttributBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKIsAgeOverAttributBuilder.java
new file mode 100644
index 000000000..d99833f13
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKIsAgeOverAttributBuilder.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ *******************************************************************************/
+package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
+
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.stork.STORKConstants;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.AttributeException;
+
+public class STORKIsAgeOverAttributBuilder implements IPVPAttributeBuilder  {
+
+	public String getName() {
+		return STORKConstants.ISAGEOVER_NAME;
+	}
+
+	public <ATT> ATT build(AuthenticationSession authSession, OAAuthParameter oaParam, AuthenticationData authData,
+			IAttributeGenerator<ATT> g) throws AttributeException {
+		
+		return g.buildStringAttribute(STORKConstants.ISAGEOVER_FRIENDLYNAME, STORKConstants.ISAGEOVER_NAME, 
+				STORKAttributHelper.getAttribut(STORKConstants.ISAGEOVER_NAME, authSession)); 
+					
+	}
+
+	public <ATT> ATT buildEmpty(IAttributeGenerator<ATT> g) {
+		return g.buildEmptyAttribute(STORKConstants.ISAGEOVER_FRIENDLYNAME, STORKConstants.ISAGEOVER_NAME);
+	}
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKMaritalStatusAttributBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKMaritalStatusAttributBuilder.java
new file mode 100644
index 000000000..1e627e723
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKMaritalStatusAttributBuilder.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ *******************************************************************************/
+package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
+
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.stork.STORKConstants;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.AttributeException;
+
+public class STORKMaritalStatusAttributBuilder implements IPVPAttributeBuilder  {
+
+	public String getName() {
+		return STORKConstants.MARITALSTATUS_NAME;
+	}
+
+	public <ATT> ATT build(AuthenticationSession authSession, OAAuthParameter oaParam, AuthenticationData authData,
+			IAttributeGenerator<ATT> g) throws AttributeException {
+		
+		return g.buildStringAttribute(STORKConstants.MARITALSTATUS_FRIENDLYNAME, STORKConstants.MARITALSTATUS_NAME, 
+				STORKAttributHelper.getAttribut(STORKConstants.MARITALSTATUS_NAME, authSession)); 
+					
+	}
+
+	public <ATT> ATT buildEmpty(IAttributeGenerator<ATT> g) {
+		return g.buildEmptyAttribute(STORKConstants.MARITALSTATUS_FRIENDLYNAME, STORKConstants.MARITALSTATUS_NAME);
+	}
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKNationalityCodeAttributBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKNationalityCodeAttributBuilder.java
new file mode 100644
index 000000000..d46219996
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKNationalityCodeAttributBuilder.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ *******************************************************************************/
+package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
+
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.stork.STORKConstants;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.AttributeException;
+
+public class STORKNationalityCodeAttributBuilder implements IPVPAttributeBuilder  {
+
+	public String getName() {
+		return STORKConstants.NATIONALITYCODE_NAME;
+	}
+
+	public <ATT> ATT build(AuthenticationSession authSession, OAAuthParameter oaParam, AuthenticationData authData,
+			IAttributeGenerator<ATT> g) throws AttributeException {
+		
+		return g.buildStringAttribute(STORKConstants.NATIONALITYCODE_FRIENDLYNAME, STORKConstants.NATIONALITYCODE_NAME, 
+				STORKAttributHelper.getAttribut(STORKConstants.NATIONALITYCODE_NAME, authSession)); 
+					
+	}
+
+	public <ATT> ATT buildEmpty(IAttributeGenerator<ATT> g) {
+		return g.buildEmptyAttribute(STORKConstants.NATIONALITYCODE_FRIENDLYNAME, STORKConstants.NATIONALITYCODE_NAME);
+	}
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKPseudonymAttributBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKPseudonymAttributBuilder.java
new file mode 100644
index 000000000..7bf6716ec
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKPseudonymAttributBuilder.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ *******************************************************************************/
+package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
+
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.stork.STORKConstants;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.AttributeException;
+
+public class STORKPseudonymAttributBuilder implements IPVPAttributeBuilder  {
+
+	public String getName() {
+		return STORKConstants.PSEUDONYM_NAME;
+	}
+
+	public <ATT> ATT build(AuthenticationSession authSession, OAAuthParameter oaParam, AuthenticationData authData,
+			IAttributeGenerator<ATT> g) throws AttributeException {
+		
+		return g.buildStringAttribute(STORKConstants.PSEUDONYM_FRIENDLYNAME, STORKConstants.PSEUDONYM_NAME, 
+				STORKAttributHelper.getAttribut(STORKConstants.PSEUDONYM_NAME, authSession)); 
+					
+	}
+
+	public <ATT> ATT buildEmpty(IAttributeGenerator<ATT> g) {
+		return g.buildEmptyAttribute(STORKConstants.PSEUDONYM_FRIENDLYNAME, STORKConstants.PSEUDONYM_NAME);
+	}
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKResidencePermitAttributBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKResidencePermitAttributBuilder.java
new file mode 100644
index 000000000..d47de1ff9
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKResidencePermitAttributBuilder.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ *******************************************************************************/
+package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
+
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.stork.STORKConstants;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.AttributeException;
+
+public class STORKResidencePermitAttributBuilder implements IPVPAttributeBuilder  {
+
+	public String getName() {
+		return STORKConstants.RESIDENCEPERMIT_NAME;
+	}
+
+	public <ATT> ATT build(AuthenticationSession authSession, OAAuthParameter oaParam, AuthenticationData authData,
+			IAttributeGenerator<ATT> g) throws AttributeException {
+		
+		return g.buildStringAttribute(STORKConstants.RESIDENCEPERMIT_FRIENDLYNAME, STORKConstants.RESIDENCEPERMIT_NAME, 
+				STORKAttributHelper.getAttribut(STORKConstants.RESIDENCEPERMIT_NAME, authSession)); 
+					
+	}
+
+	public <ATT> ATT buildEmpty(IAttributeGenerator<ATT> g) {
+		return g.buildEmptyAttribute(STORKConstants.RESIDENCEPERMIT_FRIENDLYNAME, STORKConstants.RESIDENCEPERMIT_NAME);
+	}
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKTextResidenceAddressAttributBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKTextResidenceAddressAttributBuilder.java
new file mode 100644
index 000000000..c75d6b0fb
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKTextResidenceAddressAttributBuilder.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ *******************************************************************************/
+package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
+
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.stork.STORKConstants;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.AttributeException;
+
+public class STORKTextResidenceAddressAttributBuilder implements IPVPAttributeBuilder  {
+
+	public String getName() {
+		return STORKConstants.TEXTRESIDENCEADDRESS_NAME;
+	}
+
+	public <ATT> ATT build(AuthenticationSession authSession, OAAuthParameter oaParam, AuthenticationData authData,
+			IAttributeGenerator<ATT> g) throws AttributeException {
+		
+		return g.buildStringAttribute(STORKConstants.TEXTRESIDENCEADDRESS_FRIENDLYNAME, STORKConstants.TEXTRESIDENCEADDRESS_NAME, 
+				STORKAttributHelper.getAttribut(STORKConstants.TEXTRESIDENCEADDRESS_NAME, authSession)); 
+					
+	}
+
+	public <ATT> ATT buildEmpty(IAttributeGenerator<ATT> g) {
+		return g.buildEmptyAttribute(STORKConstants.TEXTRESIDENCEADDRESS_FRIENDLYNAME, STORKConstants.TEXTRESIDENCEADDRESS_NAME);
+	}
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKTitleAttributBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKTitleAttributBuilder.java
new file mode 100644
index 000000000..357b2fe0d
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/STORKTitleAttributBuilder.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ *******************************************************************************/
+package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
+
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.stork.STORKConstants;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
+import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.AttributeException;
+
+public class STORKTitleAttributBuilder implements IPVPAttributeBuilder  {
+
+	public String getName() {
+		return STORKConstants.TITLE_NAME;
+	}
+
+	public <ATT> ATT build(AuthenticationSession authSession, OAAuthParameter oaParam, AuthenticationData authData,
+			IAttributeGenerator<ATT> g) throws AttributeException {
+		
+		return g.buildStringAttribute(STORKConstants.TITLE_FRIENDLYNAME, STORKConstants.TITLE_NAME, 
+				STORKAttributHelper.getAttribut(STORKConstants.TITLE_NAME, authSession)); 
+					
+	}
+
+	public <ATT> ATT buildEmpty(IAttributeGenerator<ATT> g) {
+		return g.buildEmptyAttribute(STORKConstants.TITLE_FRIENDLYNAME, STORKConstants.TITLE_NAME);
+	}
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/exceptions/QAANotAllowedException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/exceptions/QAANotAllowedException.java
new file mode 100644
index 000000000..63f42cbe5
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/exceptions/QAANotAllowedException.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ *******************************************************************************/
+package at.gv.egovernment.moa.id.protocols.pvp2x.exceptions;
+
+import org.opensaml.saml2.core.StatusCode;
+
+
+public class QAANotAllowedException extends PVP2Exception {
+
+	public QAANotAllowedException(String qaa_auth, String qaa_request) {
+		super("pvp2.17", new Object[] {qaa_auth, qaa_request});
+		this.statusCodeValue = StatusCode.REQUESTER_URI;
+	}
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3964192953884089323L;
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/exceptions/loginFormFull.html b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/exceptions/loginFormFull.html
new file mode 100644
index 000000000..3eff06daf
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/exceptions/loginFormFull.html
@@ -0,0 +1,851 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+
+<!-- MOA-ID 2.x BKUSelection Layout CSS -->
+<style type="text/css">
+@media screen and (min-width: 650px) {
+	body {
+		margin: 0;
+		padding: 0;
+		color: #000;
+		background-color: #fff;
+		text-align: center;
+		background-color: #6B7B8B;
+	}
+	#localBKU p {
+		font-size: 0.7em;
+	}
+	#localBKU input {
+		font-size: 0.7em;
+		/*border-radius: 5px;*/
+	}
+	#bkuselectionarea input[type=button] {
+		font-size: 0.85em;
+		/*border-radius: 7px;*/
+		margin-bottom: 25px;
+		min-width: 80px;
+	}
+	#mandateLogin {
+		font-size: 0.85em;
+	}
+	#bku_header h2 {
+		font-size: 0.8em;
+	}
+	#page {
+		display: block;
+		border: 2px solid rgb(0, 0, 0);
+		width: 650px;
+		height: 440px;
+		margin: 0 auto;
+		margin-top: 5%;
+		position: relative;
+		border-radius: 25px;
+		background: rgb(255, 255, 255);
+	}
+	#page1 {
+		text-align: center;
+	}
+	#main {
+		/*	clear:both; */
+		position: relative;
+		margin: 0 auto;
+		width: 250px;
+		text-align: center;
+	}
+	.OA_header {
+		/*	  background-color: white;*/
+		font-size: 20pt;
+		margin-bottom: 25px;
+		margin-top: 25px;
+	}
+	#leftcontent {
+		/*float:left; */
+		width: 250px;
+		margin-bottom: 25px;
+		text-align: left;
+		border: 1px solid rgb(0, 0, 0);
+	}
+	#selectArea {
+		font-size: 15px;
+		padding-bottom: 65px;
+	}
+	#leftcontent {
+		width: 300px;
+		margin-top: 30px;
+	}
+	#bku_header {
+		height: 5%;
+		padding-bottom: 3px;
+		padding-top: 3px;
+	}
+	#bkulogin {
+		overflow: hidden;
+		min-width: 190px;
+		min-height: 180px;
+		/*height: 260px;*/
+	}
+	h2#tabheader {
+		font-size: 1.1em;
+		padding-left: 2%;
+		padding-right: 2%;
+		position: relative;
+	}
+	.setAssertionButton_full {
+		background: #efefef;
+		cursor: pointer;
+		margin-top: 15px;
+		width: 100px;
+		height: 30px
+	}
+	#leftbutton {
+		width: 30%;
+		float: left;
+		margin-left: 40px;
+	}
+	#rightbutton {
+		width: 30%;
+		float: right;
+		margin-right: 45px;
+		text-align: right;
+	}
+	button {
+		height: 25px;
+		width: 75px;
+		margin-bottom: 10px;
+	}
+	#validation {
+		position: absolute;
+		bottom: 0px;
+		margin-left: 270px;
+		padding-bottom: 10px;
+	}
+}
+
+@media screen and (max-width: 205px) {
+	#localBKU p {
+		font-size: 0.6em;
+	}
+	#localBKU input {
+		font-size: 0.6em;
+		min-width: 60px;
+		/* max-width: 65px; */
+		min-height: 1.0em;
+		/* border-radius: 5px; */
+	}
+	#bkuselectionarea input[type=button] {
+		font-size: 0.7em;
+		min-width: 55px;
+		/*min-height: 1.1em;
+          border-radius: 5px;*/
+		margin-bottom: 2%
+	}
+	#mandateLogin {
+		font-size: 0.65em;
+	}
+	#bku_header h2 {
+		font-size: 0.8em;
+		margin-top: -0.4em;
+		padding-top: 0.4em;
+	}
+	#bkulogin {
+		min-height: 150px;
+	}
+}
+
+@media screen and (max-width: 249px) and (min-width: 206px) {
+	#localBKU p {
+		font-size: 0.7em;
+	}
+	#localBKU input {
+		font-size: 0.7em;
+		min-width: 70px;
+		/*    max-width: 75px;    */
+		min-height: 0.95em;
+		/*  border-radius: 6px;    */
+	}
+	#bkuselectionarea input[type=button] {
+		font-size: 0.75em;
+		min-width: 60px;
+		/*    min-height: 0.95em;
+          border-radius: 6px;    */
+		margin-bottom: 5%
+	}
+	#mandateLogin {
+		font-size: 0.75em;
+	}
+	#bku_header h2 {
+		font-size: 0.9em;
+		margin-top: -0.45em;
+		padding-top: 0.45em;
+	}
+	#bkulogin {
+		min-height: 180px;
+	}
+}
+
+@media screen and (max-width: 299px) and (min-width: 250px) {
+	#localBKU p {
+		font-size: 0.9em;
+	}
+	#localBKU input {
+		font-size: 0.8em;
+		min-width: 70px;
+		/*    max-width: 75px;      */
+		/*    border-radius: 6px;  */
+	}
+	#bkuselectionarea input[type=button] {
+		font-size: 0.85em;
+		/*     min-height: 1.05em;
+          border-radius: 7px;        */
+		margin-bottom: 10%;
+	}
+	#mandateLogin {
+		font-size: 1em;
+	}
+	#bku_header h2 {
+		font-size: 1.0em;
+		margin-top: -0.50em;
+		padding-top: 0.50em;
+	}
+}
+
+@media screen and (max-width: 399px) and (min-width: 300px) {
+	#localBKU p {
+		font-size: 0.9em;
+	}
+	#localBKU input {
+		font-size: 0.8em;
+		min-width: 70px;
+		/*     max-width: 75px;     */
+		/*    border-radius: 6px;       */
+	}
+	#bkuselectionarea input[type=button] {
+		font-size: 0.9em;
+		/*       min-height: 1.2em;
+          border-radius: 8px;          */
+		margin-bottom: 10%;
+		max-width: 80px;
+	}
+	#mandateLogin {
+		font-size: 1em;
+	}
+	#bku_header h2 {
+		font-size: 1.1em;
+		margin-top: -0.55em;
+		padding-top: 0.55em;
+	}
+}
+
+@media screen and (max-width: 649px) and (min-width: 400px) {
+	#localBKU p {
+		font-size: 0.9em;
+	}
+	#localBKU input {
+		font-size: 0.8em;
+		min-width: 70px;
+		/*     max-width: 80px;       */
+		/*     border-radius: 6px;          */
+	}
+	#bkuselectionarea input[type=button] {
+		font-size: 1.0em;
+		/*      min-height: 1.3em;
+         border-radius: 10px;         */
+		margin-bottom: 10%;
+		max-width: 85px;
+	}
+	#mandateLogin {
+		font-size: 1.2em;
+	}
+	#bku_header h2 {
+		font-size: 1.3em;
+		margin-top: -0.65em;
+		padding-top: 0.65em;
+	}
+}
+
+@media screen and (max-width: 649px) {
+	body {
+		margin: 0;
+		padding: 0;
+		color: #000;
+		text-align: center;
+		font-size: 100%;
+		background-color: #MAIN_BACKGOUNDCOLOR#;
+	}
+	#page {
+		visibility: hidden;
+		margin-top: 0%;
+	}
+	#page1 {
+		visibility: hidden;
+	}
+	#main {
+		visibility: hidden;
+	}
+	#validation {
+		visibility: hidden;
+		display: none;
+	}
+	.OA_header {
+		margin-bottom: 0px;
+		margin-top: 0px;
+		font-size: 0pt;
+		visibility: hidden;
+	}
+	#leftcontent {
+		visibility: visible;
+		margin-bottom: 0px;
+		text-align: left;
+		border: none;
+		vertical-align: middle;
+		min-height: 173px;
+		min-width: 204px;
+	}
+	#bku_header {
+		height: 10%;
+		min-height: 1.2em;
+		margin-top: 1%;
+	}
+	h2#tabheader {
+		padding-left: 2%;
+		padding-right: 2%;
+		position: relative;
+		top: 50%;
+	}
+	#bkulogin {
+		min-width: 190px;
+		min-height: 155px;
+	}
+	.setAssertionButton_full {
+		background: #efefef;
+		cursor: pointer;
+		margin-top: 15px;
+		width: 70px;
+		height: 25px;
+	}
+	input[type=button] {
+		/*          height: 11%;  */
+		width: 70%;
+	}
+}
+
+			
+			@media screen and (max-width: 649px) {
+				
+        body {
+					margin:0;
+					padding:0;
+					color : #000;
+			  	text-align: center;
+          font-size: 100%;
+			  	background-color: #MAIN_BACKGOUNDCOLOR#;
+				}
+        				
+			  #page {
+			     visibility: hidden;
+			     margin-top: 0%;
+			  }
+			  
+			  #page1 {
+			    visibility: hidden;
+			  }
+			  
+			  #main {
+			    visibility: hidden;
+			  }
+        
+        #validation {
+          visibility: hidden;
+          display: none;
+        }
+			  
+			  .OA_header {
+			    margin-bottom: 0px;
+			    margin-top: 0px;
+			    font-size: 0pt;
+			    visibility: hidden;
+			  }
+			
+			  #leftcontent {
+			    visibility: visible;
+			    margin-bottom: 0px;
+			    text-align: left;
+			    border:none;
+          vertical-align: middle;
+          min-height: 173px;
+          min-width: 204px;
+          
+			  }
+			  
+        #bku_header {
+          height: 10%;
+          min-height: 1.2em;
+          margin-top: 1%;
+        }
+        
+        h2#tabheader{
+          padding-left: 2%;
+          padding-right: 2%;
+          position: relative;
+          top: 50%;
+			  }
+        
+       	#bkulogin {	
+          min-width: 190px;
+          min-height: 155px;	
+			 }
+        
+			 .setAssertionButton_full {
+			     	background: #efefef;
+				    cursor: pointer;
+				    margin-top: 15px;
+			      width: 70px;
+			      height: 25px;
+			 }
+       
+        input[type=button] {
+/*          height: 11%;  */
+          width: 70%;
+        }
+			}
+			      
+			* {
+				margin: 0;
+				padding: 0;
+        font-family: #FONTTYPE#;
+			}
+							      			
+			#selectArea {
+				padding-top: 10px;
+				padding-bottom: 55px;
+				padding-left: 10px;
+			}
+			
+			.setAssertionButton {
+				background: #efefef;
+				cursor: pointer;
+				margin-top: 15px;
+			  width: 70px;
+			  height: 25px;
+			}
+			
+			#leftbutton  {
+				width: 35%; 
+				float:left; 
+				margin-left: 15px;
+			}
+			
+			#rightbutton {
+				width: 35%; 
+				float:right; 
+				margin-right: 25px; 
+				text-align: right;
+			}
+			
+      #mandateLogin {
+        padding-bottom: 4%;
+        padding-top: 4%;
+        height: 10%;
+        position: relative;
+        text-align: center;
+			}
+      
+      .verticalcenter {
+        vertical-align: middle;
+      }
+      
+      #mandateLogin div {
+        clear: both;
+        margin-top: -1%;
+        position: relative;
+        top: 50%;
+      }
+      
+      #bkuselectionarea {
+          position: relative;
+          display: block;
+      }
+      
+      #localBKU {
+        padding-left: 5%;
+        padding-right: 2%;
+        padding-bottom: 4%;
+        padding-top: 4%;
+        position: relative;
+        clear: both;        
+			}
+          			
+			#bkukarte {
+				float:left;
+				text-align:center;
+				width:40%;
+        min-height: 70px;
+        padding-left: 5%;
+        padding-top: 2%;
+			}
+			
+			#bkuhandy {
+				float:right;
+				text-align:center;
+				width:40%;
+        min-height: 90px;
+        padding-right: 5%;
+        padding-top: 2%;
+			}
+			
+      .bkuimage {
+        width: 90%;
+        height: auto;
+      }
+      
+			#mandate{
+				text-align:center;
+				padding : 5px 5px 5px 5px;
+			}
+      
+/*		input[type=button], .sendButton {
+				background: #BUTTON_BACKGROUNDCOLOR#;
+        color: #BUTTON_COLOR#;
+/*				border:1px solid #000;  */
+/*				cursor: pointer;
+/*        box-shadow: 3px 3px 3px #222222;  */
+/*			}
+			
+/*      button:hover, button:focus, button:active, 
+      .sendButton:hover , .sendButton:focus, .sendButton:active,
+      #mandateCheckBox:hover, #mandateCheckBox:focus, #mandateCheckBox:active {
+				background: #BUTTON_BACKGROUNDCOLOR_FOCUS#;
+        color: #BUTTON_COLOR#;
+/*				border:1px solid #000;                */
+/*				cursor: pointer;
+/*        box-shadow: -1px -1px 3px #222222;  */
+/*			}
+      
+*/
+input {
+	/*border:1px solid #000;*/
+	cursor: pointer;
+}
+
+#localBKU input {
+	/*        color: #BUTTON_COLOR#;  */
+	border: 0px;
+	display: inline-block;
+}
+
+#localBKU input:hover,#localBKU input:focus,#localBKU input:active {
+	text-decoration: underline;
+}
+
+#installJava,#BrowserNOK {
+	clear: both;
+	font-size: 0.8em;
+	padding: 4px;
+}
+
+.selectText {
+	
+}
+
+.selectTextHeader {
+	
+}
+
+.sendButton {
+	width: 30%;
+	margin-bottom: 1%;
+}
+
+#leftcontent a {
+	text-decoration: none;
+	color: #000;
+	/*	display:block;*/
+	padding: 4px;
+}
+
+#leftcontent a:hover,#leftcontent a:focus,#leftcontent a:active {
+	text-decoration: underline;
+	color: #000;
+}
+
+.infobutton {
+	background-color: #005a00;
+	color: white;
+	font-family: serif;
+	text-decoration: none;
+	padding-top: 2px;
+	padding-right: 4px;
+	padding-bottom: 2px;
+	padding-left: 4px;
+	font-weight: bold;
+}
+
+.hell {
+	background-color: #MAIN_BACKGOUNDCOLOR#;
+	color: #MAIN_COLOR#;
+}
+
+.dunkel {
+	background-color: #HEADER_BACKGROUNDCOLOR#;
+	color: #HEADER_COLOR#;
+}
+
+.main_header {
+	color: black;
+	font-size: 32pt;
+	position: absolute;
+	right: 10%;
+	top: 40px;
+}
+</style>
+<!-- MOA-ID 2.x BKUSelection JavaScript fucnctions-->
+<script type="text/javascript">
+		function isIE() {
+			return (/MSIE (\d+\.\d+);/.test(navigator.userAgent));
+		}
+		function isFullscreen() {
+			try {
+				return ((top.innerWidth == screen.width) && (top.innerHeight == screen.height));
+			} catch (e) {
+				return false;
+			}
+		}
+		function isActivexEnabled() {
+			var supported = null;
+			try {
+				supported = !!new ActiveXObject("htmlfile");
+			} catch (e) {
+				supported = false;
+			}
+			return supported;
+		}
+		function isMetro() {
+			if (!isIE())
+				return false;
+			return !isActivexEnabled() && isFullscreen();
+		}
+		window.onload=function() {
+			document.getElementById("localBKU").style.display="block";
+			return;
+		}
+		function bkuOnlineClicked() {
+			if (isMetro())
+				document.getElementById("metroDetected").style.display="block";
+			document.getElementById("localBKU").style.display="block";
+/* 			if (checkMandateSSO())
+				return; */
+			
+			setMandateSelection();
+/* 			setSSOSelection(); */
+						
+			var iFrameURL = "#AUTH_URL#" + "?";
+			iFrameURL += "bkuURI=" + "#ONLINE#";
+			iFrameURL += "&useMandate=" + document.getElementById("useMandate").value;
+/* 			iFrameURL += "&SSO=" + document.getElementById("useSSO").value; */
+			iFrameURL += "&MODUL=" + "#MODUL#";
+			iFrameURL += "&ACTION=" + "#ACTION#";
+			iFrameURL += "&MOASessionID=" + "#SESSIONID#";
+			generateIFrame(iFrameURL);
+		}
+		function bkuHandyClicked() {
+			document.getElementById("localBKU").style.display="none";
+/* 			if (checkMandateSSO())
+				return; */
+			
+			setMandateSelection();
+/* 			setSSOSelection(); */
+			
+			var iFrameURL = "#AUTH_URL#" + "?";
+			iFrameURL += "bkuURI=" + "#HANDY#";
+			iFrameURL += "&useMandate=" + document.getElementById("useMandate").value;
+/* 			iFrameURL += "&SSO=" + document.getElementById("useSSO").value; */
+			iFrameURL += "&MODUL=" + "#MODUL#";
+			iFrameURL += "&ACTION=" + "#ACTION#";
+			iFrameURL += "&MOASessionID=" + "#SESSIONID#";
+			generateIFrame(iFrameURL);
+		}
+		function storkClicked() {
+			document.getElementById("localBKU").style.display="none"; 
+/* 			if (checkMandateSSO())
+				return; */
+			
+			setMandateSelection();
+/* 			setSSOSelection(); */
+			
+			var ccc = "AT";
+			var countrySelection = document.getElementById("cccSelection");
+			if (countrySelection !=  null) {
+				ccc = document.getElementById("cccSelection").value;
+			}
+			var iFrameURL = "#AUTH_URL#" + "?";
+			iFrameURL += "bkuURI=" + "#ONLINE#";
+			iFrameURL += "&useMandate=" + document.getElementById("useMandate").value;
+			iFrameURL += "&CCC=" + ccc;
+/* 			iFrameURL += "&SSO=" + document.getElementById("useSSO").value; */
+			iFrameURL += "&MODUL=" + "#MODUL#";
+			iFrameURL += "&ACTION=" + "#ACTION#";
+			iFrameURL += "&MOASessionID=" + "#SESSIONID#";
+			generateIFrame(iFrameURL);
+		}
+		function generateIFrame(iFrameURL) {
+			var el = document.getElementById("bkulogin");
+      var width = el.clientWidth;
+      var heigth = el.clientHeight - 20;
+			var parent = el.parentNode;
+            
+      iFrameURL += "&heigth=" + heigth;
+      iFrameURL += "&width=" + width;
+      
+			var iframe = document.createElement("iframe");
+			iframe.setAttribute("src", iFrameURL);
+			iframe.setAttribute("width", el.clientWidth - 1);
+			iframe.setAttribute("height", el.clientHeight - 1);
+			iframe.setAttribute("frameborder", "0");
+			iframe.setAttribute("scrolling", "no");
+			iframe.setAttribute("title", "Login");
+			parent.replaceChild(iframe, el);
+		}
+		function setMandateSelection() {
+			document.getElementById("moaidform").action = "#AUTH_URL#";
+			document.getElementById("useMandate").value = "false";
+			var checkbox = document.getElementById("mandateCheckBox");
+			if (checkbox !=  null) {
+				if (document.getElementById("mandateCheckBox").checked) {
+					document.getElementById("useMandate").value = "true";
+				}
+			}
+		}
+		function onChangeChecks() {
+      if (top.innerWidth < 650) {
+         document.getElementById("moaidform").setAttribute("target","_parent");
+      } else {
+         document.getElementById("moaidform").removeAttribute("target");
+      }
+      
+    }
+/* 		function setSSOSelection() {
+			document.getElementById("useSSO").value = "false";
+			var checkbox = document.getElementById("SSOCheckBox");
+			if (checkbox !=  null) {
+				if (document.getElementById("SSOCheckBox").checked) {
+					document.getElementById("useSSO").value = "true";
+				}
+			}
+		} */
+		
+/* 		function checkMandateSSO() {
+			var sso = document.getElementById("SSOCheckBox");
+			var mandate = document.getElementById("mandateCheckBox");
+			
+			
+			if (sso.checked && mandate.checked) {
+				alert("Anmeldung in Vertretung in kombination mit Single Sign-On wird aktuell noch nicht unterstützt!")
+				mandate.checked = false;
+				sso.checked = false;
+				return true;
+			} else {
+				return false;
+			}
+		} */
+	</script>
+<title>Anmeldung mittels Bürgerkarte oder Handy-Signatur</title>
+</head>
+<body onload="onChangeChecks();" onresize="onChangeChecks();">
+	<div id="page">
+		<div id="page1" class="case selected-case" role="main">
+			<h2 class="OA_header" role="heading">Anmeldung an: #OAName#</h2>
+			<div id="main">
+				<div id="leftcontent" class="hell" role="application">
+					<div id="bku_header" class="dunkel">
+						<h2 id="tabheader" class="dunkel" role="heading">#HEADER_TEXT#</h2>
+					</div>
+					<div id="bkulogin" class="hell" role="form">
+						<div id="mandateLogin" style="">
+							<div>
+								<input tabindex="1" type="checkbox" name="Mandate"
+									id="mandateCheckBox" class="verticalcenter" role="checkbox"
+									onClick='document.getElementById("mandateCheckBox").setAttribute("aria-checked", document.getElementById("mandateCheckBox").checked);'#MANDATECHECKED#>
+								<label for="mandateCheckBox" class="verticalcenter">in
+									Vertretung anmelden</label>
+								<!--a      href="info_mandates.html" 
+                        target="_blank"
+                        class="infobutton verticalcenter" 
+                        tabindex="5">i</a-->
+							</div>
+						</div>
+						<div id="bkuselectionarea">
+							<div id="bkukarte">
+								<img class="bkuimage" src="#CONTEXTPATH#/img/online-bku.png"
+									alt="OnlineBKU" /> <input name="bkuButtonOnline" type="button"
+									onClick="bkuOnlineClicked();" tabindex="2" role="button"
+									value="Karte" />
+							</div>
+							<div id="bkuhandy">
+								<img class="bkuimage" src="#CONTEXTPATH#/img/mobile-bku.png"
+									alt="HandyBKU" /> <input name="bkuButtonHandy" type="button"
+									onClick="bkuHandyClicked();" tabindex="3" role="button"
+									value="HANDY" />
+							</div>
+						</div>
+						<div id="localBKU">
+							<form method="get" id="moaidform" action="#AUTH_URL#"
+								class="verticalcenter" target="_parent">
+								<input type="hidden" name="bkuURI" value="#LOCAL#"> <input
+									type="hidden" name="useMandate" id="useMandate"> <input
+									type="hidden" name="SSO" id="useSSO"> <input
+									type="hidden" name="CCC" id="ccc"> <input type="hidden"
+									name="MODUL" value="#MODUL#"> <input type="hidden"
+									name="ACTION" value="#ACTION#"> <input type="hidden"
+									name="MOASessionID" value="#SESSIONID#"> <input
+									type="submit" value=">lokale Bürgerkartenumgebung" tabindex="4"
+									role="button" class="hell">
+								<!--p>
+                    <small>Alternativ können Sie eine lokal installierte BKU verwenden.</small>								                                  
+                  </p-->								                                  
+                </form>								                                                          
+              </div>
+              <div id="stork" align="center" style="#STORKVISIBLE#">
+                <h2 id="tabheader" class="dunkel">Home Country Selection</h2>
+                <p>
+                  <select name="cccSelection" id="cccSelection" size="1" style="width: 120px; margin-right: 5px;" >
+                    <option value="BE">Belgi&euml;/Belgique</option>
+                    <option value="EE">Eesti</option>
+                    <option value="ES">Espa&ntilde;a</option>
+                    <option value="IS">&Iacute;sland</option>
+                    <option value="IT">Italia</option>
+                    <option value="LI">Liechtenstein</option>
+                    <option value="LT">Lithuania</option>
+                    <option value="PT">Portugal</option>
+                    <option value="SI">Slovenija</option>
+                    <option value="FI">Suomi</option>
+                    <option value="SE">Sverige</option>
+                  </select>
+                  <button name="bkuButton" type="button" onClick="storkClicked();">Proceed</button>
+                  <a href="info_stork.html" target="_blank" class="infobutton" style="color:#FFF">i</a>
+                </p>
+              </div>
+
+						<div id="metroDetected" style="display: none">
+							<p>Anscheinend verwenden Sie Internet Explorer im
+								Metro-Modus. Wählen Sie bitte "Auf dem Desktop anzeigen" aus den
+								Optionen um die Karten-Anmeldung starten zu können.</p>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div id="validation">
+			<a href="http://validator.w3.org/check?uri="> <img
+				style="border: 0; width: 88px; height: 31px"
+				src="#CONTEXTPATH#/img/valid-html5-blue.png" alt="HTML5 ist valide!" />
+			</a> <a href="http://jigsaw.w3.org/css-validator/"> <img
+				style="border: 0; width: 88px; height: 31px"
+				src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
+				alt="CSS ist valide!" />
+			</a>
+		</div>
+	</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/QAALevelVerifier.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/QAALevelVerifier.java
new file mode 100644
index 000000000..88a64bd07
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/QAALevelVerifier.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ */
+package at.gv.egovernment.moa.id.util;
+
+import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants;
+import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.QAANotAllowedException;
+
+/**
+ * @author tlenz
+ *
+ */
+public class QAALevelVerifier {
+
+	public static void verifyQAALevel(String qaaAuth, String qaaRequest) throws QAANotAllowedException {
+		
+		Integer qaaA = Integer.valueOf(qaaAuth.substring(PVPConstants.STORK_QAA_PREFIX.length()));
+		Integer qaaR = Integer.valueOf(qaaRequest.substring(PVPConstants.STORK_QAA_PREFIX.length()));
+		
+		if (qaaA < qaaR)
+			throw new QAANotAllowedException(qaaAuth, qaaRequest);
+		
+	}
+}
-- 
cgit v1.2.3


From 04636e11d108f26df4712c62be108d68ba166e0a Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 4 Feb 2014 12:14:06 +0100
Subject: * update demoOA layout * add test keystore

---
 .../moa/id/demoOA/servlet/pvp2/BuildMetadata.java       |  16 +++++++++++++++-
 id/oa/src/main/webapp/css/index.css                     |   5 ++++-
 id/oa/src/main/webapp/index.jsp                         |  13 ++++++++++---
 .../deploy/conf/moa-id-configuration/keys/moa_idp.p12   | Bin 0 -> 7885 bytes
 id/server/data/deploy/conf/moa-id-oa/keys/moa_idp.p12   | Bin 0 -> 7885 bytes
 id/server/data/deploy/conf/moa-id/keys/moa_idp.p12      | Bin 0 -> 7885 bytes
 id/server/data/deploy/conf/moa-id/moa-id.properties     |   8 --------
 7 files changed, 29 insertions(+), 13 deletions(-)
 create mode 100644 id/server/data/deploy/conf/moa-id-configuration/keys/moa_idp.p12
 create mode 100644 id/server/data/deploy/conf/moa-id-oa/keys/moa_idp.p12
 create mode 100644 id/server/data/deploy/conf/moa-id/keys/moa_idp.p12

(limited to 'id')

diff --git a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/BuildMetadata.java b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/BuildMetadata.java
index 4e13a34df..652960bbc 100644
--- a/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/BuildMetadata.java
+++ b/id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/BuildMetadata.java
@@ -48,6 +48,7 @@ import org.opensaml.common.xml.SAMLConstants;
 import org.opensaml.saml2.core.NameIDType;
 import org.opensaml.saml2.metadata.AssertionConsumerService;
 import org.opensaml.saml2.metadata.AttributeConsumingService;
+import org.opensaml.saml2.metadata.EncryptionMethod;
 import org.opensaml.saml2.metadata.EntitiesDescriptor;
 import org.opensaml.saml2.metadata.EntityDescriptor;
 import org.opensaml.saml2.metadata.KeyDescriptor;
@@ -55,6 +56,9 @@ import org.opensaml.saml2.metadata.LocalizedString;
 import org.opensaml.saml2.metadata.NameIDFormat;
 import org.opensaml.saml2.metadata.SPSSODescriptor;
 import org.opensaml.saml2.metadata.ServiceName;
+import org.opensaml.saml2.metadata.impl.EncryptionMethodBuilder;
+import org.opensaml.xml.encryption.EncryptionConstants;
+import org.opensaml.xml.encryption.OAEPparams;
 import org.opensaml.xml.io.Marshaller;
 import org.opensaml.xml.security.credential.Credential;
 import org.opensaml.xml.security.credential.UsageType;
@@ -187,7 +191,17 @@ public class BuildMetadata extends HttpServlet {
 				KeyDescriptor encryKeyDescriptor = SAML2Utils
 						.createSAMLObject(KeyDescriptor.class);
 				encryKeyDescriptor.setUse(UsageType.ENCRYPTION);
-				encryKeyDescriptor.setKeyInfo(keyInfoGenerator.generate(authEncCredential));	
+				encryKeyDescriptor.setKeyInfo(keyInfoGenerator.generate(authEncCredential));
+				
+				//set encryption methode
+//				EncryptionMethod encMethode = SAML2Utils.createSAMLObject(EncryptionMethod.class);
+//				encMethode.setAlgorithm(EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES128_GCM);				
+//				encryKeyDescriptor.getEncryptionMethods().add(encMethode);
+//				
+//				EncryptionMethod keyencMethode = SAML2Utils.createSAMLObject(EncryptionMethod.class);
+//				keyencMethode.setAlgorithm(EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSAOAEP);				
+//				encryKeyDescriptor.getEncryptionMethods().add(keyencMethode);
+				
 				spSSODescriptor.getKeyDescriptors().add(encryKeyDescriptor);
 				
 			} else {
diff --git a/id/oa/src/main/webapp/css/index.css b/id/oa/src/main/webapp/css/index.css
index 6ff99af63..b195a21c0 100644
--- a/id/oa/src/main/webapp/css/index.css
+++ b/id/oa/src/main/webapp/css/index.css
@@ -72,18 +72,21 @@ p {
 /* Anmeldeframe */
 #demonstrator_main {
 	clear:both;
+	margin-left: 5%;
 }
 
 #demonstrator_leftcontent {
 	/*float:left;*/
 /* 	width:255px; */
-	margin-left: 40%;
+	margin-left: 17%;
+	margin-top:25px;
 	position: relative;
 /* 	margin: 0 auto; */		
 }
 
 #submitbutton {
 	width: 150px;
+	height: 35px;
 }
 
 h2#demonstrator_tabheader, h2#demonstrator_contentheader {
diff --git a/id/oa/src/main/webapp/index.jsp b/id/oa/src/main/webapp/index.jsp
index f13a6e1bf..49f3e3e3a 100644
--- a/id/oa/src/main/webapp/index.jsp
+++ b/id/oa/src/main/webapp/index.jsp
@@ -11,10 +11,17 @@
 </head>
 <body>
 
+	
+	
 	<div id="demonstrator_main">
-             <div id="demonstrator_leftcontent">
-                  <input type="button" size="400" value="Login" onclick="PVP2LoginIframe('servlet/pvp2login');" id="submitbutton"/>
-             </div>
+		<h1>PVP2.1 Demo-Applikation für MOA-ID 2.x</h1>
+		
+		<p>Dieser Test demonstriert die Anmeldung an einer Online-Anwendung mittels Bürgerkarte oder Handy-Signatur.<br>
+			 Nach Betätigung des Login Buttons muss im ersten Schritt muss zwischen Bürgerkarte oder Handy-Signatur gewählt werden.</p>
+		
+    <div id="demonstrator_leftcontent">
+    	<input type="button" size="400" value="Login" onclick="PVP2LoginIframe('servlet/pvp2login');" id="submitbutton"/>
+    </div>
 	</div>
 	
 
diff --git a/id/server/data/deploy/conf/moa-id-configuration/keys/moa_idp.p12 b/id/server/data/deploy/conf/moa-id-configuration/keys/moa_idp.p12
new file mode 100644
index 000000000..78cab1e89
Binary files /dev/null and b/id/server/data/deploy/conf/moa-id-configuration/keys/moa_idp.p12 differ
diff --git a/id/server/data/deploy/conf/moa-id-oa/keys/moa_idp.p12 b/id/server/data/deploy/conf/moa-id-oa/keys/moa_idp.p12
new file mode 100644
index 000000000..78cab1e89
Binary files /dev/null and b/id/server/data/deploy/conf/moa-id-oa/keys/moa_idp.p12 differ
diff --git a/id/server/data/deploy/conf/moa-id/keys/moa_idp.p12 b/id/server/data/deploy/conf/moa-id/keys/moa_idp.p12
new file mode 100644
index 000000000..78cab1e89
Binary files /dev/null and b/id/server/data/deploy/conf/moa-id/keys/moa_idp.p12 differ
diff --git a/id/server/data/deploy/conf/moa-id/moa-id.properties b/id/server/data/deploy/conf/moa-id/moa-id.properties
index 879cb575a..73627ef9b 100644
--- a/id/server/data/deploy/conf/moa-id/moa-id.properties
+++ b/id/server/data/deploy/conf/moa-id/moa-id.properties
@@ -32,14 +32,6 @@ service.foreignidentities.clientKeyStore=keys/....
 service.foreignidentities.clientKeyStorePassword=
 
 
-##STORK configuration
-#STORK
-stork.samlsigningparameter.signaturecreation.keystore.file=keys/storkDemoKeys.jks
-stork.samlsigningparameter.signaturecreation.keystore.password=local-demo
-stork.samlsigningparameter.signaturecreation.keyname.name=at-demo-cert
-stork.samlsigningparameter.signaturecreation.keyname.password=stork
-
-
 ##Protocol configuration##
 #PVP2
 protocols.pvp2.idp.ks.file=file:$PATH_TO_CONFIG$/conf/moa-id/keys/moa_idp.p12
-- 
cgit v1.2.3


From 76287102b660413b778fc87fc0103b3a023747ee Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 4 Feb 2014 13:11:50 +0100
Subject: * update OAConfig validator * move old documentation to a new
 directory * add PreRelease docu * add moa-id-proxy sample-config

---
 .../validation/oa/OAGeneralConfigValidation.java   |   5 +-
 .../main/resources/applicationResources.properties |   4 +-
 .../conf/moa-id-proxy/MOAIDConfiguration.xml       |  67 +++++++
 id/server/doc/Architektur ID.vsd                   | Bin 318464 -> 0 bytes
 id/server/doc/MOA ID 1.x.wsdl                      |  41 -----
 id/server/doc/MOA-ID Feinspezifikation.doc         | Bin 268288 -> 0 bytes
 id/server/doc/MOA-ID PreRelease-1.9.98.pdf         | Bin 0 -> 417730 bytes
 .../doc/MOA-ID_PreRelease_1_9_90_SNAPSHOT.docx     | Bin 117624 -> 0 bytes
 id/server/doc/MOA-Testzertifikate.pdf              | Bin 33476 -> 0 bytes
 id/server/doc/MOA-Testzertifikate.vsd              | Bin 316416 -> 0 bytes
 id/server/doc/MOA_ID_1.2_20040315.pdf              | Bin 577309 -> 0 bytes
 id/server/doc/MOA_ID_1.3_20060315.pdf              | Bin 355156 -> 0 bytes
 id/server/doc/MOA_ID_1.4_20070802.pdf              | Bin 239502 -> 0 bytes
 id/server/doc/MOA_ID_1.4_Anhang.pdf                | Bin 286834 -> 0 bytes
 id/server/doc/MOA_ID_1.5_Anhang.pdf                | Bin 134176 -> 0 bytes
 id/server/doc/OID-1-0-3.pdf                        | Bin 347041 -> 0 bytes
 id/server/doc/bku-auswahl.20030408.pdf             | Bin 131587 -> 0 bytes
 id/server/doc/cs-sstc-schema-assertion-01.xsd      | 194 ---------------------
 id/server/doc/cs-sstc-schema-protocol-01.xsd       | 127 --------------
 id/server/doc/moa-id.htm                           |   7 -
 id/server/doc/old/Architektur ID.vsd               | Bin 0 -> 318464 bytes
 id/server/doc/old/MOA ID 1.x.wsdl                  |  41 +++++
 id/server/doc/old/MOA-ID Feinspezifikation.doc     | Bin 0 -> 268288 bytes
 id/server/doc/old/MOA-Testzertifikate.pdf          | Bin 0 -> 33476 bytes
 id/server/doc/old/MOA-Testzertifikate.vsd          | Bin 0 -> 316416 bytes
 id/server/doc/old/MOA_ID_1.2_20040315.pdf          | Bin 0 -> 577309 bytes
 id/server/doc/old/MOA_ID_1.3_20060315.pdf          | Bin 0 -> 355156 bytes
 id/server/doc/old/MOA_ID_1.4_20070802.pdf          | Bin 0 -> 239502 bytes
 id/server/doc/old/MOA_ID_1.4_Anhang.pdf            | Bin 0 -> 286834 bytes
 id/server/doc/old/MOA_ID_1.5_Anhang.pdf            | Bin 0 -> 134176 bytes
 id/server/doc/old/OID-1-0-3.pdf                    | Bin 0 -> 347041 bytes
 id/server/doc/old/bku-auswahl.20030408.pdf         | Bin 0 -> 131587 bytes
 id/server/doc/old/cs-sstc-schema-assertion-01.xsd  | 194 +++++++++++++++++++++
 id/server/doc/old/cs-sstc-schema-protocol-01.xsd   | 127 ++++++++++++++
 id/server/doc/old/moa-id.htm                       |   7 +
 35 files changed, 442 insertions(+), 372 deletions(-)
 create mode 100644 id/server/data/deploy/conf/moa-id-proxy/MOAIDConfiguration.xml
 delete mode 100644 id/server/doc/Architektur ID.vsd
 delete mode 100644 id/server/doc/MOA ID 1.x.wsdl
 delete mode 100644 id/server/doc/MOA-ID Feinspezifikation.doc
 create mode 100644 id/server/doc/MOA-ID PreRelease-1.9.98.pdf
 delete mode 100644 id/server/doc/MOA-ID_PreRelease_1_9_90_SNAPSHOT.docx
 delete mode 100644 id/server/doc/MOA-Testzertifikate.pdf
 delete mode 100644 id/server/doc/MOA-Testzertifikate.vsd
 delete mode 100644 id/server/doc/MOA_ID_1.2_20040315.pdf
 delete mode 100644 id/server/doc/MOA_ID_1.3_20060315.pdf
 delete mode 100644 id/server/doc/MOA_ID_1.4_20070802.pdf
 delete mode 100644 id/server/doc/MOA_ID_1.4_Anhang.pdf
 delete mode 100644 id/server/doc/MOA_ID_1.5_Anhang.pdf
 delete mode 100644 id/server/doc/OID-1-0-3.pdf
 delete mode 100644 id/server/doc/bku-auswahl.20030408.pdf
 delete mode 100644 id/server/doc/cs-sstc-schema-assertion-01.xsd
 delete mode 100644 id/server/doc/cs-sstc-schema-protocol-01.xsd
 delete mode 100644 id/server/doc/moa-id.htm
 create mode 100644 id/server/doc/old/Architektur ID.vsd
 create mode 100644 id/server/doc/old/MOA ID 1.x.wsdl
 create mode 100644 id/server/doc/old/MOA-ID Feinspezifikation.doc
 create mode 100644 id/server/doc/old/MOA-Testzertifikate.pdf
 create mode 100644 id/server/doc/old/MOA-Testzertifikate.vsd
 create mode 100644 id/server/doc/old/MOA_ID_1.2_20040315.pdf
 create mode 100644 id/server/doc/old/MOA_ID_1.3_20060315.pdf
 create mode 100644 id/server/doc/old/MOA_ID_1.4_20070802.pdf
 create mode 100644 id/server/doc/old/MOA_ID_1.4_Anhang.pdf
 create mode 100644 id/server/doc/old/MOA_ID_1.5_Anhang.pdf
 create mode 100644 id/server/doc/old/OID-1-0-3.pdf
 create mode 100644 id/server/doc/old/bku-auswahl.20030408.pdf
 create mode 100644 id/server/doc/old/cs-sstc-schema-assertion-01.xsd
 create mode 100644 id/server/doc/old/cs-sstc-schema-protocol-01.xsd
 create mode 100644 id/server/doc/old/moa-id.htm

(limited to 'id')

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java
index 9c950fb66..c84c44de4 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java
@@ -100,9 +100,12 @@ public class OAGeneralConfigValidation {
 		if (MiscUtil.isNotEmpty(check)) {
 			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
 				log.warn("OAFriendlyName contains potentail XSS characters: " + check);
-				errors.add(LanguageHelper.getErrorString("validation.general.oafriendlyname", 
+				errors.add(LanguageHelper.getErrorString("validation.general.oafriendlyname.valid", 
 						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
 			}
+		} else {
+			log.info("OA friendlyName is empty");
+			errors.add(LanguageHelper.getErrorString("validation.general.oafriendlyname.empty"));
 		}
 		
 		if (isAdmin) {
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources.properties b/id/ConfigWebTool/src/main/resources/applicationResources.properties
index d82855616..e20e70d75 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources.properties
@@ -353,7 +353,7 @@ validation.general.bku.local.empty=Die URL f\u00FCr die lokale BKU ist leer.
 validation.general.bku.local.valid=Die URL f\u00FCr die locale BKU hat kein g\u00FCltiges Format.
 validation.general.bku.online.empty=Die URL f\u00FCr die Online-BKU ist leer.
 validation.general.bku.online.valid=Die URL f\u00FCr die Online-BKU hat kein g\u00FCltiges Format.
-validation.general.oafriendlyname.empty=Es wurde keine Online-Applikation angegeben.
+validation.general.oafriendlyname.empty=Es wurde kein Name f\u00FCr die Online-Applikation angegeben.
 validation.general.oafriendlyname=Der Name der Online-Applikation enth\u00E4lt nicht erlaubte Zeichen. Folgende Zeichen sind nicht erlaubt\: {0}
 validation.general.keyboxidentifier.empty=Es wurde kein KeyBoxIdentifier ausgew\u00E4hlt.
 validation.general.keyboxidentifier.valid=Der KeyBoxIdentifier hat ein ung\u00FCltiges Format.
@@ -383,7 +383,7 @@ validation.stork.cpeps.cc=CPEPS L\u00E4ndercode folgt nicht ISO 3166-2
 validation.stork.cpeps.empty=CPEPS Konfiguration ist unvollst\u00E4ndig
 validation.stork.cpeps.url=CPEPS URL ist ung\u00FCltig
 validation.stork.requestedattributes=STORK Attribute sind fehlerhaft. Bsp.: attr1, attr2
-validation.stork.qaa.outofrange=Gültige QAA Werte sind 1, 2, 3, und 4
+validation.stork.qaa.outofrange=G�ltige QAA Werte sind 1, 2, 3, und 4
 validation.stork.attributes.empty=Es muss mindestens ein Attribut definiert sein
 
 validation.pvp2.metadataurl.empty=Keine Metadaten URL angegeben.
diff --git a/id/server/data/deploy/conf/moa-id-proxy/MOAIDConfiguration.xml b/id/server/data/deploy/conf/moa-id-proxy/MOAIDConfiguration.xml
new file mode 100644
index 000000000..51b36a1da
--- /dev/null
+++ b/id/server/data/deploy/conf/moa-id-proxy/MOAIDConfiguration.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Beispielkonfiguration fuer MOA-ID -->
+<MOA-IDConfiguration xmlns="http://www.buergerkarte.at/namespaces/moaconfig#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:sl10="http://www.buergerkarte.at/namespaces/securitylayer/20020225#" xmlns:sl11="http://www.buergerkarte.at/namespaces/securitylayer/20020831#">	
+	<!-- Konfiguration fuer MOA-ID-PROXY -->
+	<ProxyComponent>
+		<!-- URL und akzeptierte TLS-Server-Zertifikate des MOA-ID-AUTH Web Service -->
+		<AuthComponent>
+			<ConnectionParameter URL="http://labda.iaik.tugraz.at:8080/moa-id-auth/services/GetAuthenticationData">
+				<AcceptedServerCertificates>certs/server-certs</AcceptedServerCertificates>
+				<!--	<ClientKeyStore password="Keystore Pass">file_to_clientkeystore</ClientKeyStore> -->
+			</ConnectionParameter>
+		</AuthComponent>
+	</ProxyComponent>
+	
+  <!-- Eintragung fuer jede Online-Applikation -->
+	<!-- Demo Online-Applikation: Zugriff auf www.digitales.oesterreich.gv.at ueber MOA-ID-PROXY -->
+	<OnlineApplication type="businessService" publicURLPrefix="https://proxy.gv.at" friendlyName="Test Application">
+		<!-- fuer MOA-ID-PROXY -->
+		<ProxyComponent configFileURL="oa/BasicOAConfiguration.xml" sessionTimeOut="600" 
+        loginParameterResolverImpl="at.gv.egiz.moa.id.proxy.MySQLLoginParameterResolver" 
+        loginParameterResolverConfiguration="/var/lib/tomcat6/webapps/moa-id-proxy-umgmt/WEB-INF/classes/hibernate.cfg.xml"
+			  connectionBuilderImpl="at.gv.egovernment.moa.id.proxy.EnhancedConnectionBuilder"
+        errorRedirectURL="https://proxy.gv.at/oa2">
+
+			<!-- URL und akzeptierte TLS-Server-Zertifikate der Online-Applikation -->
+			<ConnectionParameter URL="https://proxy.gv.at/oa">
+				 <AcceptedServerCertificates>certs/server-certs</AcceptedServerCertificates>
+				<!--	<ClientKeyStore password="Keystore Pass">file_to_clientkeystore</ClientKeyStore> -->
+			</ConnectionParameter>
+		</ProxyComponent>
+	</OnlineApplication>
+  
+	<!-- Eintragung fuer jede Online-Applikation -->
+	<!-- Demo Online-Applikation: Zugriff auf www.digitales.oesterreich.gv.at ueber MOA-ID-PROXY -->
+	<OnlineApplication type="businessService" publicURLPrefix="https://proxy.gv.at" friendlyName="Test Application">
+		<!-- fuer MOA-ID-PROXY -->
+		<ProxyComponent configFileURL="oa/BasicOAConfiguration.xml" sessionTimeOut="600" 
+        errorRedirectURL="https://proxy.gv.at/oa2">
+
+			<!-- URL und akzeptierte TLS-Server-Zertifikate der Online-Applikation -->
+			<ConnectionParameter URL="https://proxy.gv.at/oa">
+				 <AcceptedServerCertificates>certs/server-certs</AcceptedServerCertificates>
+				<!--	<ClientKeyStore password="Keystore Pass">file_to_clientkeystore</ClientKeyStore> -->
+			</ConnectionParameter>
+		</ProxyComponent>
+	</OnlineApplication>
+		
+	<!-- ChainingModes fuer die Zertifikatspfadueberpruefug der TLS-Zertifikate -->
+	<ChainingModes systemDefaultMode="pkix">
+  </ChainingModes>
+	<!-- fuer MOA-ID-AUTH:  CA-Zertifikat des Servers MOA-SP, falls dieses Service ueber HTTPS angesprochen wird 
+       fuer MOA-ID-PROXY: CA-Zertifikat des Servers MOA-ID-AUTH, falls dieses Service ueber HTTPS angesprochen wird 
+       zusaeztlich: CA-Zertifikat aller Online-Applikationen, die ueber HTTPS angesprochen werden -->
+	<TrustedCACertificates>certs/ca-certs</TrustedCACertificates>
+	<!-- Cache-Verzeichnis fuer-Zertifikate -->
+	<!-- Hinweis: wenn TC in linux oder unix betrieben wird vollstaendigen pfad fuer DirectoryCertStoreParameters.RootDir verwenden -->
+	<GenericConfiguration name="DirectoryCertStoreParameters.RootDir" value="/etc/tomcat6/moa-id/certs/certstore"/>
+	<!-- Time-Out fuer die Anmeldung von Beginn bis zum Anlegen der Anmeldedaten, in Sekunden -->
+	<GenericConfiguration name="AuthenticationSession.TimeOut" value="600"/>
+	<!-- Time-Out fuer die Anmeldung vom Anlegen bis zum Abholen der Anmeldedaten, in Sekunden -->
+	<GenericConfiguration name="AuthenticationData.TimeOut" value="120"/>
+	<!-- Alternatives Data URL prefix (falls Webserver vorgeschaltet wird) -->
+	<!--GenericConfiguration name="FrontendServlets.DataURLPrefix" value="https://<your_webserver>/moa-id-auth/"/ -->
+	<!-- HTTP Verbindung auf Frontend Servlets zulassen / verbieten (falls Webserver vorgeschaltet wird) -->
+	<!-- GenericConfiguration name="FrontendServlets.EnableHTTPConnection" value="true"/ -->
+	<!-- URL Liste der vertrauenwürdigen Bürgekartenumgebungen -->
+</MOA-IDConfiguration>
diff --git a/id/server/doc/Architektur ID.vsd b/id/server/doc/Architektur ID.vsd
deleted file mode 100644
index d4678007a..000000000
Binary files a/id/server/doc/Architektur ID.vsd and /dev/null differ
diff --git a/id/server/doc/MOA ID 1.x.wsdl b/id/server/doc/MOA ID 1.x.wsdl
deleted file mode 100644
index 4d1c8d71d..000000000
--- a/id/server/doc/MOA ID 1.x.wsdl	
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XML Spy v4.4 U (http://www.xmlspy.com) by patrick peck (anecon) -->
-<definitions name="MOA" targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:xsd="http://www.w3.org/1999/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl/">
-	<import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" location="MOA-SPSS-2.0.0.xsd"/>
-	<message name="GetAuthenticationDataInput">
-		<part name="body" element="samlp:Request"/>
-	</message>
-	<message name="GetAuthenticationDataOutput">
-		<part name="body" element="samlp:Response"/>
-	</message>
-	<message name="MOAFault">
-		<part name="body" element="moa:ErrorResponse"/>
-	</message>
-	<portType name="IdentificationPortType">
-		<operation name="getAuthenticationData">
-			<input message="tns:GetAuthenticationDataInput"/>
-			<output message="tns:GetAuthenticationDataOutput"/>
-			<fault name="MOAFault" message="tns:MOAFault"/>
-		</operation>
-	</portType>
-	<binding name="IdentificationBinding" type="tns:IdentificationPortType" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/soap/ http://schemas.xmlsoap.org/wsdl/soap/">
-		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-		<operation name="getAuthenticationData">
-			<soap:operation soapAction="urn:GetAuthenticationDataAction"/>
-			<input>
-				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
-			</input>
-			<output>
-				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
-			</output>
-			<fault name="MOAFault">
-				<soap:fault name="MOAFault" use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
-			</fault>
-		</operation>
-	</binding>
-	<service name="GetAuthenticationDataService">
-		<port name="IdentificationPort" binding="tns:IdentificationBinding">
-			<soap:address location="http://localhost/Identification"/>
-		</port>
-	</service>
-</definitions>
diff --git a/id/server/doc/MOA-ID Feinspezifikation.doc b/id/server/doc/MOA-ID Feinspezifikation.doc
deleted file mode 100644
index e71ffa8e6..000000000
Binary files a/id/server/doc/MOA-ID Feinspezifikation.doc and /dev/null differ
diff --git a/id/server/doc/MOA-ID PreRelease-1.9.98.pdf b/id/server/doc/MOA-ID PreRelease-1.9.98.pdf
new file mode 100644
index 000000000..527251961
Binary files /dev/null and b/id/server/doc/MOA-ID PreRelease-1.9.98.pdf differ
diff --git a/id/server/doc/MOA-ID_PreRelease_1_9_90_SNAPSHOT.docx b/id/server/doc/MOA-ID_PreRelease_1_9_90_SNAPSHOT.docx
deleted file mode 100644
index 9c63cd941..000000000
Binary files a/id/server/doc/MOA-ID_PreRelease_1_9_90_SNAPSHOT.docx and /dev/null differ
diff --git a/id/server/doc/MOA-Testzertifikate.pdf b/id/server/doc/MOA-Testzertifikate.pdf
deleted file mode 100644
index a2c44f2a2..000000000
Binary files a/id/server/doc/MOA-Testzertifikate.pdf and /dev/null differ
diff --git a/id/server/doc/MOA-Testzertifikate.vsd b/id/server/doc/MOA-Testzertifikate.vsd
deleted file mode 100644
index c36051c04..000000000
Binary files a/id/server/doc/MOA-Testzertifikate.vsd and /dev/null differ
diff --git a/id/server/doc/MOA_ID_1.2_20040315.pdf b/id/server/doc/MOA_ID_1.2_20040315.pdf
deleted file mode 100644
index 0c89c2730..000000000
Binary files a/id/server/doc/MOA_ID_1.2_20040315.pdf and /dev/null differ
diff --git a/id/server/doc/MOA_ID_1.3_20060315.pdf b/id/server/doc/MOA_ID_1.3_20060315.pdf
deleted file mode 100644
index c9b0d160c..000000000
Binary files a/id/server/doc/MOA_ID_1.3_20060315.pdf and /dev/null differ
diff --git a/id/server/doc/MOA_ID_1.4_20070802.pdf b/id/server/doc/MOA_ID_1.4_20070802.pdf
deleted file mode 100644
index a3a2f1177..000000000
Binary files a/id/server/doc/MOA_ID_1.4_20070802.pdf and /dev/null differ
diff --git a/id/server/doc/MOA_ID_1.4_Anhang.pdf b/id/server/doc/MOA_ID_1.4_Anhang.pdf
deleted file mode 100644
index 0c923666f..000000000
Binary files a/id/server/doc/MOA_ID_1.4_Anhang.pdf and /dev/null differ
diff --git a/id/server/doc/MOA_ID_1.5_Anhang.pdf b/id/server/doc/MOA_ID_1.5_Anhang.pdf
deleted file mode 100644
index ed2743d3c..000000000
Binary files a/id/server/doc/MOA_ID_1.5_Anhang.pdf and /dev/null differ
diff --git a/id/server/doc/OID-1-0-3.pdf b/id/server/doc/OID-1-0-3.pdf
deleted file mode 100644
index 4beab3e41..000000000
Binary files a/id/server/doc/OID-1-0-3.pdf and /dev/null differ
diff --git a/id/server/doc/bku-auswahl.20030408.pdf b/id/server/doc/bku-auswahl.20030408.pdf
deleted file mode 100644
index 39efe315f..000000000
Binary files a/id/server/doc/bku-auswahl.20030408.pdf and /dev/null differ
diff --git a/id/server/doc/cs-sstc-schema-assertion-01.xsd b/id/server/doc/cs-sstc-schema-assertion-01.xsd
deleted file mode 100644
index 8bc5af147..000000000
--- a/id/server/doc/cs-sstc-schema-assertion-01.xsd
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XML Spy v3.5 NT (http://www.xmlspy.com) by Phill Hallam-Baker (VeriSign Inc.) -->
-<schema targetNamespace="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
-        <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
-        <annotation>
-                <documentation>
-                Document identifier: cs-sstc-schema-assertion-01
-                Location: http://www.oasis-open.org/committees/security/docs/
-                </documentation>
-        </annotation>
-        <simpleType name="IDType">
-                <restriction base="string"/>
-        </simpleType>
-        <simpleType name="IDReferenceType">
-                <restriction base="string"/>
-        </simpleType>
-        <simpleType name="DecisionType">
-                <restriction base="string">
-                        <enumeration value="Permit"/>
-                        <enumeration value="Deny"/>
-                        <enumeration value="Indeterminate"/>
-                </restriction>
-        </simpleType>
-        <element name="AssertionIDReference" type="saml:IDReferenceType"/>
-        <element name="Assertion" type="saml:AssertionType"/>
-        <complexType name="AssertionType">
-                <sequence>
-                        <element ref="saml:Conditions" minOccurs="0"/>
-                        <element ref="saml:Advice" minOccurs="0"/>
-                        <choice maxOccurs="unbounded">
-                                <element ref="saml:Statement"/>
-                                <element ref="saml:SubjectStatement"/>
-                                <element ref="saml:AuthenticationStatement"/>
-                                <element ref="saml:AuthorizationDecisionStatement"/>
-                                <element ref="saml:AttributeStatement"/>
-                        </choice>
-                        <element ref="ds:Signature" minOccurs="0"/>
-                </sequence>
-                <attribute name="MajorVersion" type="integer" use="required"/>
-                <attribute name="MinorVersion" type="integer" use="required"/>
-                <attribute name="AssertionID" type="saml:IDType" use="required"/>
-                <attribute name="Issuer" type="string" use="required"/>
-                <attribute name="IssueInstant" type="dateTime" use="required"/>
-        </complexType>
-        <element name="Conditions" type="saml:ConditionsType"/>
-        <complexType name="ConditionsType">
-                <choice minOccurs="0" maxOccurs="unbounded">
-                        <element ref="saml:AudienceRestrictionCondition"/>
-                        <element ref="saml:Condition"/>
-                </choice>
-                <attribute name="NotBefore" type="dateTime" use="optional"/>
-                <attribute name="NotOnOrAfter" type="dateTime" use="optional"/>
-        </complexType>
-        <element name="Condition" type="saml:ConditionAbstractType"/>
-        <complexType name="ConditionAbstractType" abstract="true"/>
-        <element name="AudienceRestrictionCondition" type="saml:AudienceRestrictionConditionType"/>
-        <complexType name="AudienceRestrictionConditionType">
-                <complexContent>
-                        <extension base="saml:ConditionAbstractType">
-                                <sequence>
-                                        <element ref="saml:Audience" maxOccurs="unbounded"/>
-                                </sequence>
-                        </extension>
-                </complexContent>
-        </complexType>
-        <element name="Audience" type="anyURI"/>
-        <element name="Advice" type="saml:AdviceType"/>
-        <complexType name="AdviceType">
-                <choice minOccurs="0" maxOccurs="unbounded">
-                        <element ref="saml:AssertionIDReference"/>
-                        <element ref="saml:Assertion"/>
-                        <any namespace="##other" processContents="lax"/>
-                </choice>
-        </complexType>
-        <element name="Statement" type="saml:StatementAbstractType"/>
-        <complexType name="StatementAbstractType" abstract="true"/>
-        <element name="SubjectStatement" type="saml:SubjectStatementAbstractType"/>
-        <complexType name="SubjectStatementAbstractType" abstract="true">
-                <complexContent>
-                        <extension base="saml:StatementAbstractType">
-                                <sequence>
-                                        <element ref="saml:Subject"/>
-                                </sequence>
-                        </extension>
-                </complexContent>
-        </complexType>
-        <element name="Subject" type="saml:SubjectType"/>
-        <complexType name="SubjectType">
-                <choice>
-                        <sequence>
-                                <element ref="saml:NameIdentifier"/>
-                                <element ref="saml:SubjectConfirmation" minOccurs="0"/>
-                        </sequence>
-                        <element ref="saml:SubjectConfirmation"/>
-                </choice>
-        </complexType>
-        <element name="NameIdentifier" type="saml:NameIdentifierType"/>
-        <complexType name="NameIdentifierType">
-                <simpleContent>
-                        <extension base="string">
-                                <attribute name="NameQualifier" type="string" use="optional"/>
-                                <attribute name="Format" type="anyURI" use="optional"/>
-                        </extension>
-                </simpleContent>
-        </complexType>
-        <element name="SubjectConfirmation" type="saml:SubjectConfirmationType"/>
-        <complexType name="SubjectConfirmationType">
-                <sequence>
-                        <element ref="saml:ConfirmationMethod" maxOccurs="unbounded"/>
-                        <element ref="saml:SubjectConfirmationData" minOccurs="0"/>
-                        <element ref="ds:KeyInfo" minOccurs="0"/>
-                </sequence>
-        </complexType>
-        <element name="SubjectConfirmationData" type="anyType"/>
-        <element name="ConfirmationMethod" type="anyURI"/>
-        <element name="AuthenticationStatement" type="saml:AuthenticationStatementType"/>
-        <complexType name="AuthenticationStatementType">
-                <complexContent>
-                        <extension base="saml:SubjectStatementAbstractType">
-                                <sequence>
-                                        <element ref="saml:SubjectLocality" minOccurs="0"/>
-                                        <element ref="saml:AuthorityBinding" minOccurs="0" maxOccurs="unbounded"/>
-                                </sequence>
-                                <attribute name="AuthenticationMethod" type="anyURI" use="required"/>
-                                <attribute name="AuthenticationInstant" type="dateTime" use="required"/>
-                        </extension>
-                </complexContent>
-        </complexType>
-        <element name="SubjectLocality" type="saml:SubjectLocalityType"/>
-        <complexType name="SubjectLocalityType">
-                <attribute name="IPAddress" type="string" use="optional"/>
-                <attribute name="DNSAddress" type="string" use="optional"/>
-        </complexType>
-        <element name="AuthorityBinding" type="saml:AuthorityBindingType"/>
-        <complexType name="AuthorityBindingType">
-                <attribute name="AuthorityKind" type="QName" use="required"/>
-                <attribute name="Location" type="anyURI" use="required"/>
-                <attribute name="Binding" type="anyURI" use="required"/>
-        </complexType>
-        <element name="AuthorizationDecisionStatement" type="saml:AuthorizationDecisionStatementType"/>
-        <complexType name="AuthorizationDecisionStatementType">
-                <complexContent>
-                        <extension base="saml:SubjectStatementAbstractType">
-                                <sequence>
-                                        <element ref="saml:Action" maxOccurs="unbounded"/>
-                                        <element ref="saml:Evidence" minOccurs="0"/>
-                                </sequence>
-                                <attribute name="Resource" type="anyURI" use="required"/>
-                                <attribute name="Decision" type="saml:DecisionType" use="required"/>
-                        </extension>
-                </complexContent>
-        </complexType>
-        <element name="Action" type="saml:ActionType"/>
-        <complexType name="ActionType">
-                <simpleContent>
-                        <extension base="string">
-                                <attribute name="Namespace" type="anyURI"/>
-                        </extension>
-                </simpleContent>
-        </complexType>
-        <element name="Evidence" type="saml:EvidenceType"/>
-        <complexType name="EvidenceType">
-                <choice maxOccurs="unbounded">
-                        <element ref="saml:AssertionIDReference"/>
-                        <element ref="saml:Assertion"/>
-                </choice>
-        </complexType>
-        <element name="AttributeStatement" type="saml:AttributeStatementType"/>
-        <complexType name="AttributeStatementType">
-                <complexContent>
-                        <extension base="saml:SubjectStatementAbstractType">
-                                <sequence>
-                                        <element ref="saml:Attribute" maxOccurs="unbounded"/>
-                                </sequence>
-                        </extension>
-                </complexContent>
-        </complexType>
-        <element name="AttributeDesignator" type="saml:AttributeDesignatorType"/>
-        <complexType name="AttributeDesignatorType">
-                <attribute name="AttributeName" type="string" use="required"/>
-                <attribute name="AttributeNamespace" type="anyURI" use="required"/>
-        </complexType>
-        <element name="Attribute" type="saml:AttributeType"/>
-        <complexType name="AttributeType">
-                <complexContent>
-                        <extension base="saml:AttributeDesignatorType">
-                                <sequence>
-                                        <element ref="saml:AttributeValue" maxOccurs="unbounded"/>
-                                </sequence>
-                        </extension>
-                </complexContent>
-        </complexType>
-        <element name="AttributeValue" type="anyType"/>
-</schema>
diff --git a/id/server/doc/cs-sstc-schema-protocol-01.xsd b/id/server/doc/cs-sstc-schema-protocol-01.xsd
deleted file mode 100644
index ecad05b0f..000000000
--- a/id/server/doc/cs-sstc-schema-protocol-01.xsd
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XML Spy v4.2 U (http://www.xmlspy.com) by Phillip Hallam-Baker (Phillip Hallam-Baker) -->
-<schema targetNamespace="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
-        <import namespace="urn:oasis:names:tc:SAML:1.0:assertion" schemaLocation="cs-sstc-schema-assertion-01.xsd"/>
-        <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
-        <annotation>
-                <documentation>
-                Document identifier: cs-sstc-schema-protocol-01
-                Location: http://www.oasis-open.org/committees/security/docs/
-                </documentation>
-        </annotation>
-        <complexType name="RequestAbstractType" abstract="true">
-                <sequence>
-                        <element ref="samlp:RespondWith" minOccurs="0" maxOccurs="unbounded"/>
-                        <element ref="ds:Signature" minOccurs="0"/>
-                </sequence>
-                <attribute name="RequestID" type="saml:IDType" use="required"/>
-                <attribute name="MajorVersion" type="integer" use="required"/>
-                <attribute name="MinorVersion" type="integer" use="required"/>
-                <attribute name="IssueInstant" type="dateTime" use="required"/>
-        </complexType>
-        <element name="RespondWith" type="QName"/>
-        <element name="Request" type="samlp:RequestType"/>
-        <complexType name="RequestType">
-                <complexContent>
-                        <extension base="samlp:RequestAbstractType">
-                                <choice>
-                                        <element ref="samlp:Query"/>
-                                        <element ref="samlp:SubjectQuery"/>
-                                        <element ref="samlp:AuthenticationQuery"/>
-                                        <element ref="samlp:AttributeQuery"/>
-                                        <element ref="samlp:AuthorizationDecisionQuery"/>
-                                        <element ref="saml:AssertionIDReference" maxOccurs="unbounded"/>
-                                        <element ref="samlp:AssertionArtifact" maxOccurs="unbounded"/>
-                                </choice>
-                        </extension>
-                </complexContent>
-        </complexType>
-        <element name="AssertionArtifact" type="string"/>
-        <element name="Query" type="samlp:QueryAbstractType"/>
-        <complexType name="QueryAbstractType" abstract="true"/>
-        <element name="SubjectQuery" type="samlp:SubjectQueryAbstractType"/>
-        <complexType name="SubjectQueryAbstractType" abstract="true">
-                <complexContent>
-                        <extension base="samlp:QueryAbstractType">
-                                <sequence>
-                                        <element ref="saml:Subject"/>
-                                </sequence>
-                        </extension>
-                </complexContent>
-        </complexType>
-        <element name="AuthenticationQuery" type="samlp:AuthenticationQueryType"/>
-        <complexType name="AuthenticationQueryType">
-                <complexContent>
-                        <extension base="samlp:SubjectQueryAbstractType">
-                                <attribute name="AuthenticationMethod" type="anyURI"/>
-                        </extension>
-                </complexContent>
-        </complexType>
-        <element name="AttributeQuery" type="samlp:AttributeQueryType"/>
-        <complexType name="AttributeQueryType">
-                <complexContent>
-                        <extension base="samlp:SubjectQueryAbstractType">
-                                <sequence>
-                                        <element ref="saml:AttributeDesignator" minOccurs="0" maxOccurs="unbounded"/>
-                                </sequence>
-                                <attribute name="Resource" type="anyURI" use="optional"/>
-                        </extension>
-                </complexContent>
-        </complexType>
-        <element name="AuthorizationDecisionQuery" type="samlp:AuthorizationDecisionQueryType"/>
-        <complexType name="AuthorizationDecisionQueryType">
-                <complexContent>
-                        <extension base="samlp:SubjectQueryAbstractType">
-                                <sequence>
-                                        <element ref="saml:Action" maxOccurs="unbounded"/>
-                                        <element ref="saml:Evidence" minOccurs="0" maxOccurs="1"/>
-                                </sequence>
-                                <attribute name="Resource" type="anyURI" use="required"/>
-                        </extension>
-                </complexContent>
-        </complexType>
-        <complexType name="ResponseAbstractType" abstract="true">
-                <sequence>
-                        <element ref="ds:Signature" minOccurs="0"/>
-                </sequence>
-                <attribute name="ResponseID" type="saml:IDType" use="required"/>
-                <attribute name="InResponseTo" type="saml:IDReferenceType" use="optional"/>
-                <attribute name="MajorVersion" type="integer" use="required"/>
-                <attribute name="MinorVersion" type="integer" use="required"/>
-                <attribute name="IssueInstant" type="dateTime" use="required"/>
-                <attribute name="Recipient" type="anyURI" use="optional"/>
-        </complexType>
-        <element name="Response" type="samlp:ResponseType"/>
-        <complexType name="ResponseType">
-                <complexContent>
-                        <extension base="samlp:ResponseAbstractType">
-                                <sequence>
-                                        <element ref="samlp:Status"/>
-                                        <element ref="saml:Assertion" minOccurs="0" maxOccurs="unbounded"/>
-                                </sequence>
-                        </extension>
-                </complexContent>
-        </complexType>
-        <element name="Status" type="samlp:StatusType"/>
-        <complexType name="StatusType">
-                <sequence>
-                        <element ref="samlp:StatusCode"/>
-                        <element ref="samlp:StatusMessage" minOccurs="0" maxOccurs="1"/>
-                        <element ref="samlp:StatusDetail" minOccurs="0"/>
-                </sequence>
-        </complexType>
-        <element name="StatusCode" type="samlp:StatusCodeType"/>
-        <complexType name="StatusCodeType">
-                <sequence>
-                        <element ref="samlp:StatusCode" minOccurs="0"/>
-                </sequence>
-                <attribute name="Value" type="QName" use="required"/>
-        </complexType>
-        <element name="StatusMessage" type="string"/>
-        <element name="StatusDetail" type="samlp:StatusDetailType"/>
-        <complexType name="StatusDetailType">
-                <sequence>
-                        <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-        </complexType>
-</schema>
diff --git a/id/server/doc/moa-id.htm b/id/server/doc/moa-id.htm
deleted file mode 100644
index 82e5adc19..000000000
--- a/id/server/doc/moa-id.htm
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<head>
-<meta http-equiv="refresh" content="0; URL=moa_id/moa.htm"/> 
-
-</head>
-<body></body>
-</html>
\ No newline at end of file
diff --git a/id/server/doc/old/Architektur ID.vsd b/id/server/doc/old/Architektur ID.vsd
new file mode 100644
index 000000000..d4678007a
Binary files /dev/null and b/id/server/doc/old/Architektur ID.vsd differ
diff --git a/id/server/doc/old/MOA ID 1.x.wsdl b/id/server/doc/old/MOA ID 1.x.wsdl
new file mode 100644
index 000000000..4d1c8d71d
--- /dev/null
+++ b/id/server/doc/old/MOA ID 1.x.wsdl	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XML Spy v4.4 U (http://www.xmlspy.com) by patrick peck (anecon) -->
+<definitions name="MOA" targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:xsd="http://www.w3.org/1999/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl/">
+	<import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" location="MOA-SPSS-2.0.0.xsd"/>
+	<message name="GetAuthenticationDataInput">
+		<part name="body" element="samlp:Request"/>
+	</message>
+	<message name="GetAuthenticationDataOutput">
+		<part name="body" element="samlp:Response"/>
+	</message>
+	<message name="MOAFault">
+		<part name="body" element="moa:ErrorResponse"/>
+	</message>
+	<portType name="IdentificationPortType">
+		<operation name="getAuthenticationData">
+			<input message="tns:GetAuthenticationDataInput"/>
+			<output message="tns:GetAuthenticationDataOutput"/>
+			<fault name="MOAFault" message="tns:MOAFault"/>
+		</operation>
+	</portType>
+	<binding name="IdentificationBinding" type="tns:IdentificationPortType" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/soap/ http://schemas.xmlsoap.org/wsdl/soap/">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<operation name="getAuthenticationData">
+			<soap:operation soapAction="urn:GetAuthenticationDataAction"/>
+			<input>
+				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
+			</input>
+			<output>
+				<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
+			</output>
+			<fault name="MOAFault">
+				<soap:fault name="MOAFault" use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
+			</fault>
+		</operation>
+	</binding>
+	<service name="GetAuthenticationDataService">
+		<port name="IdentificationPort" binding="tns:IdentificationBinding">
+			<soap:address location="http://localhost/Identification"/>
+		</port>
+	</service>
+</definitions>
diff --git a/id/server/doc/old/MOA-ID Feinspezifikation.doc b/id/server/doc/old/MOA-ID Feinspezifikation.doc
new file mode 100644
index 000000000..e71ffa8e6
Binary files /dev/null and b/id/server/doc/old/MOA-ID Feinspezifikation.doc differ
diff --git a/id/server/doc/old/MOA-Testzertifikate.pdf b/id/server/doc/old/MOA-Testzertifikate.pdf
new file mode 100644
index 000000000..a2c44f2a2
Binary files /dev/null and b/id/server/doc/old/MOA-Testzertifikate.pdf differ
diff --git a/id/server/doc/old/MOA-Testzertifikate.vsd b/id/server/doc/old/MOA-Testzertifikate.vsd
new file mode 100644
index 000000000..c36051c04
Binary files /dev/null and b/id/server/doc/old/MOA-Testzertifikate.vsd differ
diff --git a/id/server/doc/old/MOA_ID_1.2_20040315.pdf b/id/server/doc/old/MOA_ID_1.2_20040315.pdf
new file mode 100644
index 000000000..0c89c2730
Binary files /dev/null and b/id/server/doc/old/MOA_ID_1.2_20040315.pdf differ
diff --git a/id/server/doc/old/MOA_ID_1.3_20060315.pdf b/id/server/doc/old/MOA_ID_1.3_20060315.pdf
new file mode 100644
index 000000000..c9b0d160c
Binary files /dev/null and b/id/server/doc/old/MOA_ID_1.3_20060315.pdf differ
diff --git a/id/server/doc/old/MOA_ID_1.4_20070802.pdf b/id/server/doc/old/MOA_ID_1.4_20070802.pdf
new file mode 100644
index 000000000..a3a2f1177
Binary files /dev/null and b/id/server/doc/old/MOA_ID_1.4_20070802.pdf differ
diff --git a/id/server/doc/old/MOA_ID_1.4_Anhang.pdf b/id/server/doc/old/MOA_ID_1.4_Anhang.pdf
new file mode 100644
index 000000000..0c923666f
Binary files /dev/null and b/id/server/doc/old/MOA_ID_1.4_Anhang.pdf differ
diff --git a/id/server/doc/old/MOA_ID_1.5_Anhang.pdf b/id/server/doc/old/MOA_ID_1.5_Anhang.pdf
new file mode 100644
index 000000000..ed2743d3c
Binary files /dev/null and b/id/server/doc/old/MOA_ID_1.5_Anhang.pdf differ
diff --git a/id/server/doc/old/OID-1-0-3.pdf b/id/server/doc/old/OID-1-0-3.pdf
new file mode 100644
index 000000000..4beab3e41
Binary files /dev/null and b/id/server/doc/old/OID-1-0-3.pdf differ
diff --git a/id/server/doc/old/bku-auswahl.20030408.pdf b/id/server/doc/old/bku-auswahl.20030408.pdf
new file mode 100644
index 000000000..39efe315f
Binary files /dev/null and b/id/server/doc/old/bku-auswahl.20030408.pdf differ
diff --git a/id/server/doc/old/cs-sstc-schema-assertion-01.xsd b/id/server/doc/old/cs-sstc-schema-assertion-01.xsd
new file mode 100644
index 000000000..8bc5af147
--- /dev/null
+++ b/id/server/doc/old/cs-sstc-schema-assertion-01.xsd
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XML Spy v3.5 NT (http://www.xmlspy.com) by Phill Hallam-Baker (VeriSign Inc.) -->
+<schema targetNamespace="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
+        <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
+        <annotation>
+                <documentation>
+                Document identifier: cs-sstc-schema-assertion-01
+                Location: http://www.oasis-open.org/committees/security/docs/
+                </documentation>
+        </annotation>
+        <simpleType name="IDType">
+                <restriction base="string"/>
+        </simpleType>
+        <simpleType name="IDReferenceType">
+                <restriction base="string"/>
+        </simpleType>
+        <simpleType name="DecisionType">
+                <restriction base="string">
+                        <enumeration value="Permit"/>
+                        <enumeration value="Deny"/>
+                        <enumeration value="Indeterminate"/>
+                </restriction>
+        </simpleType>
+        <element name="AssertionIDReference" type="saml:IDReferenceType"/>
+        <element name="Assertion" type="saml:AssertionType"/>
+        <complexType name="AssertionType">
+                <sequence>
+                        <element ref="saml:Conditions" minOccurs="0"/>
+                        <element ref="saml:Advice" minOccurs="0"/>
+                        <choice maxOccurs="unbounded">
+                                <element ref="saml:Statement"/>
+                                <element ref="saml:SubjectStatement"/>
+                                <element ref="saml:AuthenticationStatement"/>
+                                <element ref="saml:AuthorizationDecisionStatement"/>
+                                <element ref="saml:AttributeStatement"/>
+                        </choice>
+                        <element ref="ds:Signature" minOccurs="0"/>
+                </sequence>
+                <attribute name="MajorVersion" type="integer" use="required"/>
+                <attribute name="MinorVersion" type="integer" use="required"/>
+                <attribute name="AssertionID" type="saml:IDType" use="required"/>
+                <attribute name="Issuer" type="string" use="required"/>
+                <attribute name="IssueInstant" type="dateTime" use="required"/>
+        </complexType>
+        <element name="Conditions" type="saml:ConditionsType"/>
+        <complexType name="ConditionsType">
+                <choice minOccurs="0" maxOccurs="unbounded">
+                        <element ref="saml:AudienceRestrictionCondition"/>
+                        <element ref="saml:Condition"/>
+                </choice>
+                <attribute name="NotBefore" type="dateTime" use="optional"/>
+                <attribute name="NotOnOrAfter" type="dateTime" use="optional"/>
+        </complexType>
+        <element name="Condition" type="saml:ConditionAbstractType"/>
+        <complexType name="ConditionAbstractType" abstract="true"/>
+        <element name="AudienceRestrictionCondition" type="saml:AudienceRestrictionConditionType"/>
+        <complexType name="AudienceRestrictionConditionType">
+                <complexContent>
+                        <extension base="saml:ConditionAbstractType">
+                                <sequence>
+                                        <element ref="saml:Audience" maxOccurs="unbounded"/>
+                                </sequence>
+                        </extension>
+                </complexContent>
+        </complexType>
+        <element name="Audience" type="anyURI"/>
+        <element name="Advice" type="saml:AdviceType"/>
+        <complexType name="AdviceType">
+                <choice minOccurs="0" maxOccurs="unbounded">
+                        <element ref="saml:AssertionIDReference"/>
+                        <element ref="saml:Assertion"/>
+                        <any namespace="##other" processContents="lax"/>
+                </choice>
+        </complexType>
+        <element name="Statement" type="saml:StatementAbstractType"/>
+        <complexType name="StatementAbstractType" abstract="true"/>
+        <element name="SubjectStatement" type="saml:SubjectStatementAbstractType"/>
+        <complexType name="SubjectStatementAbstractType" abstract="true">
+                <complexContent>
+                        <extension base="saml:StatementAbstractType">
+                                <sequence>
+                                        <element ref="saml:Subject"/>
+                                </sequence>
+                        </extension>
+                </complexContent>
+        </complexType>
+        <element name="Subject" type="saml:SubjectType"/>
+        <complexType name="SubjectType">
+                <choice>
+                        <sequence>
+                                <element ref="saml:NameIdentifier"/>
+                                <element ref="saml:SubjectConfirmation" minOccurs="0"/>
+                        </sequence>
+                        <element ref="saml:SubjectConfirmation"/>
+                </choice>
+        </complexType>
+        <element name="NameIdentifier" type="saml:NameIdentifierType"/>
+        <complexType name="NameIdentifierType">
+                <simpleContent>
+                        <extension base="string">
+                                <attribute name="NameQualifier" type="string" use="optional"/>
+                                <attribute name="Format" type="anyURI" use="optional"/>
+                        </extension>
+                </simpleContent>
+        </complexType>
+        <element name="SubjectConfirmation" type="saml:SubjectConfirmationType"/>
+        <complexType name="SubjectConfirmationType">
+                <sequence>
+                        <element ref="saml:ConfirmationMethod" maxOccurs="unbounded"/>
+                        <element ref="saml:SubjectConfirmationData" minOccurs="0"/>
+                        <element ref="ds:KeyInfo" minOccurs="0"/>
+                </sequence>
+        </complexType>
+        <element name="SubjectConfirmationData" type="anyType"/>
+        <element name="ConfirmationMethod" type="anyURI"/>
+        <element name="AuthenticationStatement" type="saml:AuthenticationStatementType"/>
+        <complexType name="AuthenticationStatementType">
+                <complexContent>
+                        <extension base="saml:SubjectStatementAbstractType">
+                                <sequence>
+                                        <element ref="saml:SubjectLocality" minOccurs="0"/>
+                                        <element ref="saml:AuthorityBinding" minOccurs="0" maxOccurs="unbounded"/>
+                                </sequence>
+                                <attribute name="AuthenticationMethod" type="anyURI" use="required"/>
+                                <attribute name="AuthenticationInstant" type="dateTime" use="required"/>
+                        </extension>
+                </complexContent>
+        </complexType>
+        <element name="SubjectLocality" type="saml:SubjectLocalityType"/>
+        <complexType name="SubjectLocalityType">
+                <attribute name="IPAddress" type="string" use="optional"/>
+                <attribute name="DNSAddress" type="string" use="optional"/>
+        </complexType>
+        <element name="AuthorityBinding" type="saml:AuthorityBindingType"/>
+        <complexType name="AuthorityBindingType">
+                <attribute name="AuthorityKind" type="QName" use="required"/>
+                <attribute name="Location" type="anyURI" use="required"/>
+                <attribute name="Binding" type="anyURI" use="required"/>
+        </complexType>
+        <element name="AuthorizationDecisionStatement" type="saml:AuthorizationDecisionStatementType"/>
+        <complexType name="AuthorizationDecisionStatementType">
+                <complexContent>
+                        <extension base="saml:SubjectStatementAbstractType">
+                                <sequence>
+                                        <element ref="saml:Action" maxOccurs="unbounded"/>
+                                        <element ref="saml:Evidence" minOccurs="0"/>
+                                </sequence>
+                                <attribute name="Resource" type="anyURI" use="required"/>
+                                <attribute name="Decision" type="saml:DecisionType" use="required"/>
+                        </extension>
+                </complexContent>
+        </complexType>
+        <element name="Action" type="saml:ActionType"/>
+        <complexType name="ActionType">
+                <simpleContent>
+                        <extension base="string">
+                                <attribute name="Namespace" type="anyURI"/>
+                        </extension>
+                </simpleContent>
+        </complexType>
+        <element name="Evidence" type="saml:EvidenceType"/>
+        <complexType name="EvidenceType">
+                <choice maxOccurs="unbounded">
+                        <element ref="saml:AssertionIDReference"/>
+                        <element ref="saml:Assertion"/>
+                </choice>
+        </complexType>
+        <element name="AttributeStatement" type="saml:AttributeStatementType"/>
+        <complexType name="AttributeStatementType">
+                <complexContent>
+                        <extension base="saml:SubjectStatementAbstractType">
+                                <sequence>
+                                        <element ref="saml:Attribute" maxOccurs="unbounded"/>
+                                </sequence>
+                        </extension>
+                </complexContent>
+        </complexType>
+        <element name="AttributeDesignator" type="saml:AttributeDesignatorType"/>
+        <complexType name="AttributeDesignatorType">
+                <attribute name="AttributeName" type="string" use="required"/>
+                <attribute name="AttributeNamespace" type="anyURI" use="required"/>
+        </complexType>
+        <element name="Attribute" type="saml:AttributeType"/>
+        <complexType name="AttributeType">
+                <complexContent>
+                        <extension base="saml:AttributeDesignatorType">
+                                <sequence>
+                                        <element ref="saml:AttributeValue" maxOccurs="unbounded"/>
+                                </sequence>
+                        </extension>
+                </complexContent>
+        </complexType>
+        <element name="AttributeValue" type="anyType"/>
+</schema>
diff --git a/id/server/doc/old/cs-sstc-schema-protocol-01.xsd b/id/server/doc/old/cs-sstc-schema-protocol-01.xsd
new file mode 100644
index 000000000..ecad05b0f
--- /dev/null
+++ b/id/server/doc/old/cs-sstc-schema-protocol-01.xsd
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XML Spy v4.2 U (http://www.xmlspy.com) by Phillip Hallam-Baker (Phillip Hallam-Baker) -->
+<schema targetNamespace="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
+        <import namespace="urn:oasis:names:tc:SAML:1.0:assertion" schemaLocation="cs-sstc-schema-assertion-01.xsd"/>
+        <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
+        <annotation>
+                <documentation>
+                Document identifier: cs-sstc-schema-protocol-01
+                Location: http://www.oasis-open.org/committees/security/docs/
+                </documentation>
+        </annotation>
+        <complexType name="RequestAbstractType" abstract="true">
+                <sequence>
+                        <element ref="samlp:RespondWith" minOccurs="0" maxOccurs="unbounded"/>
+                        <element ref="ds:Signature" minOccurs="0"/>
+                </sequence>
+                <attribute name="RequestID" type="saml:IDType" use="required"/>
+                <attribute name="MajorVersion" type="integer" use="required"/>
+                <attribute name="MinorVersion" type="integer" use="required"/>
+                <attribute name="IssueInstant" type="dateTime" use="required"/>
+        </complexType>
+        <element name="RespondWith" type="QName"/>
+        <element name="Request" type="samlp:RequestType"/>
+        <complexType name="RequestType">
+                <complexContent>
+                        <extension base="samlp:RequestAbstractType">
+                                <choice>
+                                        <element ref="samlp:Query"/>
+                                        <element ref="samlp:SubjectQuery"/>
+                                        <element ref="samlp:AuthenticationQuery"/>
+                                        <element ref="samlp:AttributeQuery"/>
+                                        <element ref="samlp:AuthorizationDecisionQuery"/>
+                                        <element ref="saml:AssertionIDReference" maxOccurs="unbounded"/>
+                                        <element ref="samlp:AssertionArtifact" maxOccurs="unbounded"/>
+                                </choice>
+                        </extension>
+                </complexContent>
+        </complexType>
+        <element name="AssertionArtifact" type="string"/>
+        <element name="Query" type="samlp:QueryAbstractType"/>
+        <complexType name="QueryAbstractType" abstract="true"/>
+        <element name="SubjectQuery" type="samlp:SubjectQueryAbstractType"/>
+        <complexType name="SubjectQueryAbstractType" abstract="true">
+                <complexContent>
+                        <extension base="samlp:QueryAbstractType">
+                                <sequence>
+                                        <element ref="saml:Subject"/>
+                                </sequence>
+                        </extension>
+                </complexContent>
+        </complexType>
+        <element name="AuthenticationQuery" type="samlp:AuthenticationQueryType"/>
+        <complexType name="AuthenticationQueryType">
+                <complexContent>
+                        <extension base="samlp:SubjectQueryAbstractType">
+                                <attribute name="AuthenticationMethod" type="anyURI"/>
+                        </extension>
+                </complexContent>
+        </complexType>
+        <element name="AttributeQuery" type="samlp:AttributeQueryType"/>
+        <complexType name="AttributeQueryType">
+                <complexContent>
+                        <extension base="samlp:SubjectQueryAbstractType">
+                                <sequence>
+                                        <element ref="saml:AttributeDesignator" minOccurs="0" maxOccurs="unbounded"/>
+                                </sequence>
+                                <attribute name="Resource" type="anyURI" use="optional"/>
+                        </extension>
+                </complexContent>
+        </complexType>
+        <element name="AuthorizationDecisionQuery" type="samlp:AuthorizationDecisionQueryType"/>
+        <complexType name="AuthorizationDecisionQueryType">
+                <complexContent>
+                        <extension base="samlp:SubjectQueryAbstractType">
+                                <sequence>
+                                        <element ref="saml:Action" maxOccurs="unbounded"/>
+                                        <element ref="saml:Evidence" minOccurs="0" maxOccurs="1"/>
+                                </sequence>
+                                <attribute name="Resource" type="anyURI" use="required"/>
+                        </extension>
+                </complexContent>
+        </complexType>
+        <complexType name="ResponseAbstractType" abstract="true">
+                <sequence>
+                        <element ref="ds:Signature" minOccurs="0"/>
+                </sequence>
+                <attribute name="ResponseID" type="saml:IDType" use="required"/>
+                <attribute name="InResponseTo" type="saml:IDReferenceType" use="optional"/>
+                <attribute name="MajorVersion" type="integer" use="required"/>
+                <attribute name="MinorVersion" type="integer" use="required"/>
+                <attribute name="IssueInstant" type="dateTime" use="required"/>
+                <attribute name="Recipient" type="anyURI" use="optional"/>
+        </complexType>
+        <element name="Response" type="samlp:ResponseType"/>
+        <complexType name="ResponseType">
+                <complexContent>
+                        <extension base="samlp:ResponseAbstractType">
+                                <sequence>
+                                        <element ref="samlp:Status"/>
+                                        <element ref="saml:Assertion" minOccurs="0" maxOccurs="unbounded"/>
+                                </sequence>
+                        </extension>
+                </complexContent>
+        </complexType>
+        <element name="Status" type="samlp:StatusType"/>
+        <complexType name="StatusType">
+                <sequence>
+                        <element ref="samlp:StatusCode"/>
+                        <element ref="samlp:StatusMessage" minOccurs="0" maxOccurs="1"/>
+                        <element ref="samlp:StatusDetail" minOccurs="0"/>
+                </sequence>
+        </complexType>
+        <element name="StatusCode" type="samlp:StatusCodeType"/>
+        <complexType name="StatusCodeType">
+                <sequence>
+                        <element ref="samlp:StatusCode" minOccurs="0"/>
+                </sequence>
+                <attribute name="Value" type="QName" use="required"/>
+        </complexType>
+        <element name="StatusMessage" type="string"/>
+        <element name="StatusDetail" type="samlp:StatusDetailType"/>
+        <complexType name="StatusDetailType">
+                <sequence>
+                        <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+        </complexType>
+</schema>
diff --git a/id/server/doc/old/moa-id.htm b/id/server/doc/old/moa-id.htm
new file mode 100644
index 000000000..82e5adc19
--- /dev/null
+++ b/id/server/doc/old/moa-id.htm
@@ -0,0 +1,7 @@
+<html>
+<head>
+<meta http-equiv="refresh" content="0; URL=moa_id/moa.htm"/> 
+
+</head>
+<body></body>
+</html>
\ No newline at end of file
-- 
cgit v1.2.3


From 265a005d263ef99d57f53169cbd15b94d09046c8 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 4 Feb 2014 13:26:01 +0100
Subject: bugfix

---
 id/ConfigWebTool/src/main/resources/applicationResources.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id')

diff --git a/id/ConfigWebTool/src/main/resources/applicationResources.properties b/id/ConfigWebTool/src/main/resources/applicationResources.properties
index e20e70d75..216f74850 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources.properties
@@ -354,7 +354,7 @@ validation.general.bku.local.valid=Die URL f\u00FCr die locale BKU hat kein g\u0
 validation.general.bku.online.empty=Die URL f\u00FCr die Online-BKU ist leer.
 validation.general.bku.online.valid=Die URL f\u00FCr die Online-BKU hat kein g\u00FCltiges Format.
 validation.general.oafriendlyname.empty=Es wurde kein Name f\u00FCr die Online-Applikation angegeben.
-validation.general.oafriendlyname=Der Name der Online-Applikation enth\u00E4lt nicht erlaubte Zeichen. Folgende Zeichen sind nicht erlaubt\: {0}
+validation.general.oafriendlyname.valid=Der Name der Online-Applikation enth\u00E4lt nicht erlaubte Zeichen. Folgende Zeichen sind nicht erlaubt\: {0}
 validation.general.keyboxidentifier.empty=Es wurde kein KeyBoxIdentifier ausgew\u00E4hlt.
 validation.general.keyboxidentifier.valid=Der KeyBoxIdentifier hat ein ung\u00FCltiges Format.
 validation.general.sltemplates.empty=Wenn der Legacymodus verwendet werden soll muss zumindest ein SecurityLayer Template angegeben werden.
@@ -383,7 +383,7 @@ validation.stork.cpeps.cc=CPEPS L\u00E4ndercode folgt nicht ISO 3166-2
 validation.stork.cpeps.empty=CPEPS Konfiguration ist unvollst\u00E4ndig
 validation.stork.cpeps.url=CPEPS URL ist ung\u00FCltig
 validation.stork.requestedattributes=STORK Attribute sind fehlerhaft. Bsp.: attr1, attr2
-validation.stork.qaa.outofrange=G�ltige QAA Werte sind 1, 2, 3, und 4
+validation.stork.qaa.outofrange=G\u00FCltige QAA Werte sind 1, 2, 3, und 4
 validation.stork.attributes.empty=Es muss mindestens ein Attribut definiert sein
 
 validation.pvp2.metadataurl.empty=Keine Metadaten URL angegeben.
-- 
cgit v1.2.3